Fixed an issue where the 'Check for Updates' button did not appear after application restart if the /upgrade_check API had already been called earlier that day.

anilsahoo20 · anilsahoo20 · commit e6524663bd43 · 2025-07-15T12:03:59.000+05:30
diff --git a/runtime/src/js/pgadmin.js b/runtime/src/js/pgadmin.js
@@ -440,18 +440,26 @@ let splashWindow;
 // Helper to notify update installed after restart
 function notifyUpdateInstalled() {
   if (configStore.get('update_installed')) {
-    // Reset the flag
-    configStore.set('update_installed', false);
-    // Notify renderer
-    if (pgAdminMainScreen) {
-      misc.writeServerLog('[Auto-Updater]: Update installed successfully...');
-      pgAdminMainScreen.webContents.send('notifyAppAutoUpdate', {update_installed: true});
-    } else {
-      // If main screen not ready, wait and send after it's created
-      app.once('browser-window-created', (event, window) => {
+    try {
+      // Notify renderer
+      if (pgAdminMainScreen) {
         misc.writeServerLog('[Auto-Updater]: Update installed successfully...');
-        window.webContents.send('notifyAppAutoUpdate', {update_installed: true});
-      });
+        setTimeout(() => {
+          pgAdminMainScreen.webContents.send('notifyAppAutoUpdate', {update_installed: true});
+        }, 10000);
+      } else {
+        // If main screen not ready, wait and send after it's created
+        app.once('browser-window-created', (event, window) => {
+          misc.writeServerLog('[Auto-Updater]: Update installed successfully...');
+          setTimeout(() => {
+            pgAdminMainScreen.webContents.send('notifyAppAutoUpdate', {update_installed: true});
+          }, 10000);
+        });
+      }
+      // Reset the flag
+      configStore.set('update_installed', false);
+    } catch (err) {
+      misc.writeServerLog(`[Auto-Updater]: ${err}`);
     }
   }
 }
diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js
@@ -280,7 +280,7 @@ define('pgadmin.browser', [
           'check_for_updates': data.check_for_auto_updates,
         });
         const isDesktopWithAutoUpdate = pgAdmin.server_mode == 'False' && data.check_for_auto_updates && data.auto_update_url !== '';
-        const isUpdateAvailable = data.upgrade_version_int > data.current_version_int;
+        const isUpdateAvailable = data.outdated && data.upgrade_version_int > data.current_version_int;
         const noUpdateMessage = 'No update available...';
         // This is for desktop installers whose auto_update_url is mentioned in https://www.pgadmin.org/versions.json
         if (isDesktopWithAutoUpdate) {
diff --git a/web/pgadmin/misc/__init__.py b/web/pgadmin/misc/__init__.py
@@ -355,114 +355,125 @@ def upgrade_check():
     if config.UPGRADE_CHECK_ENABLED:
         last_check = get_setting('LastUpdateCheck', default='0')
         today = time.strftime('%Y%m%d')
-        # Check for updates if either:
-        # - The last check was before today (daily check), or
-        # - The user manually triggered an update check
-        if int(last_check) < int(today) or trigger_update_check:
-            data = None
-            url = '%s?version=%s' % (
-                config.UPGRADE_CHECK_URL, config.APP_VERSION)
-            current_app.logger.debug('Checking version data at: %s' % url)
-            try:
-                # Do not wait for more than 5 seconds.
-                # It stuck on rendering the browser.html, while working in the
-                # broken network.
-                if os.path.exists(config.CA_FILE) and sys.version_info >= (
-                        3, 13):
-                    # Use SSL context for Python 3.13+
-                    context = ssl.create_default_context(cafile=config.CA_FILE)
-                    response = urlopen(url, data=data, timeout=5,
-                                       context=context)
-                elif os.path.exists(config.CA_FILE):
-                    # Use cafile parameter for older versions
-                    response = urlopen(url, data=data, timeout=5,
-                                       cafile=config.CA_FILE)
-                else:
-                    response = urlopen(url, data, 5)
-                current_app.logger.debug(
-                    'Version check HTTP response code: %d' % response.getcode()
-                )
 
-                if response.getcode() == 200:
-                    data = json.loads(response.read().decode('utf-8'))
-                    current_app.logger.debug('Response data: %s' % data)
-            except Exception:
-                current_app.logger.exception(
-                    'Exception when checking for update')
-                return internal_server_error('Failed to check for update')
+        data = None
+        url = '%s?version=%s' % (
+            config.UPGRADE_CHECK_URL, config.APP_VERSION)
+        current_app.logger.debug('Checking version data at: %s' % url)
+        try:
+            # Do not wait for more than 5 seconds.
+            # It stuck on rendering the browser.html, while working in the
+            # broken network.
+            if os.path.exists(config.CA_FILE) and sys.version_info >= (
+                    3, 13):
+                # Use SSL context for Python 3.13+
+                context = ssl.create_default_context(cafile=config.CA_FILE)
+                response = urlopen(url, data=data, timeout=5,
+                                   context=context)
+            elif os.path.exists(config.CA_FILE):
+                # Use cafile parameter for older versions
+                response = urlopen(url, data=data, timeout=5,
+                                   cafile=config.CA_FILE)
+            else:
+                response = urlopen(url, data, 5)
+            current_app.logger.debug(
+                'Version check HTTP response code: %d' % response.getcode()
+            )
 
+            if response.getcode() == 200:
+                data = json.loads(response.read().decode('utf-8'))
+                current_app.logger.debug('Response data: %s' % data)
+        except Exception:
+            current_app.logger.exception(
+                'Exception when checking for update')
+            return internal_server_error('Failed to check for update')
+
+        if data is not None:
             if sys.platform == 'darwin':
                 platform = 'macos'
             elif sys.platform == 'win32':
                 platform = 'windows'
 
-            # Check if the fetched data is valid and if the latest
-            # version is newer than the current version.
-            if data is not None and \
-                data[config.UPGRADE_CHECK_KEY]['version_int'] > \
-                    config.APP_VERSION_INT:
-                # If running in desktop mode with a valid auto-update
-                # URL for the current platform, prepare a response that
-                # enables the auto-update feature in the client.
-                if not config.SERVER_MODE and data[config.UPGRADE_CHECK_KEY][
-                        'auto_update_url'][platform] != '':
-                    ret = {
-                        "outdated": True,
-                        "check_for_auto_updates": True,
-                        "auto_update_url": data[config.UPGRADE_CHECK_KEY][
-                            'auto_update_url'][platform],
-                        "platform": platform,
-                        "installer_type": config.UPGRADE_CHECK_KEY,
-                        "current_version": config.APP_VERSION,
-                        "upgrade_version": data[config.UPGRADE_CHECK_KEY][
-                            'version'],
-                        "current_version_int": config.APP_VERSION_INT,
-                        "upgrade_version_int": data[config.UPGRADE_CHECK_KEY][
-                            'version_int'],
-                        "product_name": config.APP_NAME,
-                        "download_url": data[config.UPGRADE_CHECK_KEY][
-                            'download_url']
-                    }
+            auto_update_supported_update_res = {
+                "outdated": True,
+                "check_for_auto_updates": True,
+                "auto_update_url": data[config.UPGRADE_CHECK_KEY][
+                    'auto_update_url'][platform],
+                "platform": platform,
+                "installer_type": config.UPGRADE_CHECK_KEY,
+                "current_version": config.APP_VERSION,
+                "upgrade_version": data[config.UPGRADE_CHECK_KEY][
+                    'version'],
+                "current_version_int": config.APP_VERSION_INT,
+                "upgrade_version_int": data[config.UPGRADE_CHECK_KEY][
+                    'version_int'],
+                "product_name": config.APP_NAME,
+                "download_url": data[config.UPGRADE_CHECK_KEY][
+                    'download_url']
+            }
+            auto_update_supported_no_update_res = {
+                "outdated": False,
+                "check_for_auto_updates": True,
+                "auto_update_url": data[config.UPGRADE_CHECK_KEY][
+                    'auto_update_url'][platform],
+                "platform": platform,
+                "installer_type": config.UPGRADE_CHECK_KEY,
+                "current_version": config.APP_VERSION,
+                "upgrade_version": data[config.UPGRADE_CHECK_KEY][
+                    'version'],
+                "current_version_int": config.APP_VERSION_INT,
+                "upgrade_version_int": data[config.UPGRADE_CHECK_KEY][
+                    'version_int'],
+                "product_name": config.APP_NAME,
+                "download_url": data[config.UPGRADE_CHECK_KEY][
+                    'download_url']
+            }
+            # Check for updates if the last check was before today(daily check)
+            if int(last_check) < int(today):
+                # Check if the fetched data is valid and if the latest
+                # version is newer than the current version.
+                if data[config.UPGRADE_CHECK_KEY]['version_int'] > \
+                        config.APP_VERSION_INT:
+                    # In desktop mode with a valid URL, enable
+                    # auto-update in the client response.
+                    if (not config.SERVER_MODE and
+                            data[config.UPGRADE_CHECK_KEY][
+                                'auto_update_url'][platform] != ''):
+                        ret = auto_update_supported_update_res
+                    else:
+                        # For server mode or unsupported auto-update,
+                        # show update but disable auto-update and
+                        # provide download link.
+                        ret = {
+                            "outdated": True,
+                            "check_for_auto_updates": False,
+                            "current_version": config.APP_VERSION,
+                            "upgrade_version": data[config.UPGRADE_CHECK_KEY][
+                                'version'],
+                            "product_name": config.APP_NAME,
+                            "download_url": data[config.UPGRADE_CHECK_KEY][
+                                'download_url']
+                        }
+                # In desktop mode, app is up-to-date but inform client
+                # about auto-update support.
+                elif (data[config.UPGRADE_CHECK_KEY]['version_int'] ==
+                      config.APP_VERSION_INT and
+                      not config.SERVER_MODE and
+                      data[config.UPGRADE_CHECK_KEY]['auto_update_url'][
+                          platform] != ''):
+                    ret = auto_update_supported_no_update_res
+            # If checked today, in desktop mode, and auto-update URL exists,
+            # inform client about auto-update support.
+            elif (int(last_check) == int(today) and not config.SERVER_MODE and
+                  data[config.UPGRADE_CHECK_KEY][
+                      'auto_update_url'][platform] != ''):
+                # Check for updates when triggered by user
+                # and new version is available
+                if data[config.UPGRADE_CHECK_KEY]['version_int'] > \
+                        config.APP_VERSION_INT and trigger_update_check:
+                    ret = auto_update_supported_update_res
                 else:
-                    # For server mode or if auto-update is not supported,
-                    # indicate an update is available but disable
-                    # the auto-update feature. The user will be
-                    # directed to the download URL.
-                    ret = {
-                        "outdated": True,
-                        "check_for_auto_updates": False,
-                        "current_version": config.APP_VERSION,
-                        "upgrade_version": data[config.UPGRADE_CHECK_KEY][
-                            'version'],
-                        "product_name": config.APP_NAME,
-                        "download_url": data[config.UPGRADE_CHECK_KEY][
-                            'download_url']
-                    }
-            # This handles a specific desktop mode case: the current version
-            # is up-to-date, but we still need to inform the client
-            # about the auto-update capability.
-            elif (data[config.UPGRADE_CHECK_KEY]['version_int'] ==
-                  config.APP_VERSION_INT and
-                  not config.SERVER_MODE and
-                  data[config.UPGRADE_CHECK_KEY]['auto_update_url'][
-                      platform] != ''):
-                ret = {
-                    "outdated": False,
-                    "check_for_auto_updates": True,
-                    "auto_update_url": data[config.UPGRADE_CHECK_KEY][
-                        'auto_update_url'][platform],
-                    "platform": platform,
-                    "installer_type": config.UPGRADE_CHECK_KEY,
-                    "current_version": config.APP_VERSION,
-                    "upgrade_version": data[config.UPGRADE_CHECK_KEY][
-                        'version'],
-                    "current_version_int": config.APP_VERSION_INT,
-                    "upgrade_version_int": data[config.UPGRADE_CHECK_KEY][
-                        'version_int'],
-                    "product_name": config.APP_NAME,
-                    "download_url": data[config.UPGRADE_CHECK_KEY][
-                        'download_url']
-                }
+                    ret = auto_update_supported_no_update_res
 
         store_setting('LastUpdateCheck', today)
     return make_json_response(data=ret)
diff --git a/web/pgadmin/static/js/BrowserComponent.jsx b/web/pgadmin/static/js/BrowserComponent.jsx
@@ -205,6 +205,7 @@ export default function BrowserComponent({pgAdmin}) {
       } else if (data.error) {
         appAutoUpdateNotifier(`${data.errMsg}`, 'error');
       } else if (data.update_installed) {
+        console.warn('in browsercomp------','Update installed');
         const UPDATE_INSTALLED_MESSAGE = gettext('Update installed successfully!');
         appAutoUpdateNotifier(UPDATE_INSTALLED_MESSAGE, 'success');
       }
diff --git a/web/pgadmin/static/js/helpers/appAutoUpdateNotifier.jsx b/web/pgadmin/static/js/helpers/appAutoUpdateNotifier.jsx
@@ -97,7 +97,7 @@ export function appAutoUpdateNotifier(desc, type, onClick, hideDuration=null, ti
 
   // Mark this warning as active
   activeWarningKeys.add(uniqueKey);
-
+  console.warn('before if',desc,type);
   if (type == 'warning') {
     pgAdmin.Browser.notifier.notify(
       <UpdateWarningNotifier
@@ -113,6 +113,7 @@ export function appAutoUpdateNotifier(desc, type, onClick, hideDuration=null, ti
       />, null
     );
   } else if(type == 'success') {
+    console.warn('inside if',desc,type);
     pgAdmin.Browser.notifier.success(desc, hideDuration);
   } else if(type == 'info') {
     pgAdmin.Browser.notifier.info(desc, hideDuration);
diff --git a/web/version.py b/web/version.py
@@ -18,7 +18,7 @@
 
 # Application version number components
 APP_RELEASE = 9
-APP_REVISION = 5
+APP_REVISION = 6
 
 # Application version suffix, e.g. 'beta1', 'dev'. Usually an empty string
 # for GA releases.
@@ -27,7 +27,7 @@
 # Numeric application version for upgrade checks. Should be in the format:
 # [X]XYYZZ, where X is the release version, Y is the revision, with a leading
 # zero if needed, and Z represents the suffix, with a leading zero if needed
-APP_VERSION_INT = 90500
+APP_VERSION_INT = 90600
 
 # DO NOT CHANGE!
 # The application version string, constructed from the components

Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,7 @@ export default function BrowserComponent({pgAdmin}) {`
`205`	`205`	`} else if (data.error) {`
`206`	`206`	appAutoUpdateNotifier(`${data.errMsg}`, 'error');
`207`	`207`	`} else if (data.update_installed) {`
	`208`	`+ console.warn('in browsercomp------','Update installed');`
`208`	`209`	`const UPDATE_INSTALLED_MESSAGE = gettext('Update installed successfully!');`
`209`	`210`	`appAutoUpdateNotifier(UPDATE_INSTALLED_MESSAGE, 'success');`
`210`	`211`	`}`