Merge pull request #6175 from menloresearch/fix/feature-toggle-auto-updater

fix: feature toggle auto updater

web-app/src/hooks/__tests__/useAppUpdater.test.ts

@@ -48,6 +48,12 @@ Object.defineProperty(window, 'core', {
   writable: true,
 })
 
+// Mock global AUTO_UPDATER_DISABLED
+Object.defineProperty(global, 'AUTO_UPDATER_DISABLED', {
+  value: false,
+  writable: true,
+})
+
 import { isDev } from '@/lib/utils'
 import { check } from '@tauri-apps/plugin-updater'
 import { events } from '@janhq/core'
@@ -251,11 +257,14 @@ describe('useAppUpdater', () => {
         downloadAndInstall: mockDownloadAndInstall,
       }
 
+      // Mock check to return the update
+      mockCheck.mockResolvedValue(mockUpdate)
+
       const { result } = renderHook(() => useAppUpdater())
 
-      // Set update info first
+      // Set update info first by calling checkForUpdate
-      act(() => {
+      await act(async () => {
-        result.current.updateState.updateInfo = mockUpdate
+        await result.current.checkForUpdate()
       })
 
       // Mock the download and install process
@@ -296,11 +305,14 @@ describe('useAppUpdater', () => {
         downloadAndInstall: mockDownloadAndInstall,
       }
 
+      // Mock check to return the update
+      mockCheck.mockResolvedValue(mockUpdate)
+
       const { result } = renderHook(() => useAppUpdater())
 
-      // Set update info first
+      // Set update info first by calling checkForUpdate
-      act(() => {
+      await act(async () => {
-        result.current.updateState.updateInfo = mockUpdate
+        await result.current.checkForUpdate()
       })
 
       mockDownloadAndInstall.mockRejectedValue(new Error('Download failed'))
@@ -338,11 +350,14 @@ describe('useAppUpdater', () => {
         downloadAndInstall: mockDownloadAndInstall,
       }
 
+      // Mock check to return the update
+      mockCheck.mockResolvedValue(mockUpdate)
+
       const { result } = renderHook(() => useAppUpdater())
 
-      // Set update info first
+      // Set update info first by calling checkForUpdate
-      act(() => {
+      await act(async () => {
-        result.current.updateState.updateInfo = mockUpdate
+        await result.current.checkForUpdate()
       })
 
       mockDownloadAndInstall.mockImplementation(async (progressCallback) => {

web-app/src/hooks/useAppUpdater.ts

@@ -53,6 +53,11 @@ export const useAppUpdater = () => {
 
   const checkForUpdate = useCallback(
     async (resetRemindMeLater = false) => {
+      if (AUTO_UPDATER_DISABLED) {
+        console.log('Auto updater is disabled')
+        return
+      }
+
       try {
         // Reset remindMeLater if requested (e.g., when called from settings)
         if (resetRemindMeLater) {
@@ -148,6 +153,11 @@ export const useAppUpdater = () => {
   )
 
   const downloadAndInstallUpdate = useCallback(async () => {
+    if (AUTO_UPDATER_DISABLED) {
+      console.log('Auto updater is disabled')
+      return
+    }
+
     if (!updateState.updateInfo) return
 
     try {

web-app/src/routes/settings/general.tsx

@@ -260,6 +260,7 @@ function General() {
                   </span>
                 }
               />
+              {!AUTO_UPDATER_DISABLED && (
                 <CardItem
                   title={t('settings:general.checkForUpdates')}
                   description={t('settings:general.checkForUpdatesDesc')}
@@ -280,6 +281,7 @@ function General() {
                     </Button>
                   }
                 />
+              )}
               {/* <CardItem
                 title={t('common:language')}
                 actions={<LanguageSwitcher />}