janhq · Van-QA · Jul 15, 2024 · Jun 17, 2024 · Jun 17, 2024 · Jun 20, 2024
diff --git a/electron/preload.ts b/electron/preload.ts
@@ -3,16 3,19 @@
  * @module preload
  */
 
-import { APIEvents, APIRoutes } from '@janhq/core/node'
 import { APIEvents, APIRoutes, AppConfiguration, getAppConfigurations, updateAppConfiguration } from '@janhq/core/node'
 import { contextBridge, ipcRenderer } from 'electron'
 import {readdirSync} from 'fs'
 
 const interfaces: { [key: string]: (...args: any[]) => any } = {}
 
 // Loop over each route in APIRoutes
 APIRoutes.forEach((method) => {
  // For each method, create a function on the interfaces object
  // This function invokes the method on the ipcRenderer with any provided arguments
 
  interfaces[method] = (...args: any[]) => ipcRenderer.invoke(method, ...args)
 
 })
 
 // Loop over each method in APIEvents
@@ -22,6 25,24 @@ APIEvents.forEach((method) => {
  // The handler for the event is provided as an argument to the function
  interfaces[method] = (handler: any) => ipcRenderer.on(method, handler)
 })
 
 
 interfaces['changeDataFolder'] = async path => {
  const appConfiguration: AppConfiguration =
  getAppConfigurations()
  const currentJanDataFolder = appConfiguration.data_folder
  appConfiguration.data_folder = path
  const { err } = await ipcRenderer.invoke('syncFile', currentJanDataFolder, path)
  if (err) throw err
  await ipcRenderer.invoke('updateAppConfiguration', appConfiguration)
 }
 
 interfaces['isDirectoryEmpty'] = async path => {
  const dirChildren= await readdirSync(path)
  return dirChildren.filter((x) => x !== '.DS_Store').length === 0
 }
 
 delete interfaces['syncFile']
 // Expose the 'interfaces' object in the main world under the name 'electronAPI'
 // This allows the renderer process to access these methods directly
 contextBridge.exposeInMainWorld('electronAPI', {

diff --git a/web/screens/Settings/Advanced/DataFolder/index.tsx b/web/screens/Settings/Advanced/DataFolder/index.tsx
@@ -1,6 1,6 @@
 import { Fragment, useCallback, useState } from 'react'

 import { fs, AppConfiguration, isSubdirectory } from '@janhq/core'
 import { Button, Input } from '@janhq/joi'
 import { useAtomValue, useSetAtom } from 'jotai'
 import { PencilIcon, FolderOpenIcon } from 'lucide-react'
@@ -51,11 51,10 @@
  return
  }
 
- const newDestChildren: string[] = await fs.readdirSync(destFolder)
- const isNotEmpty =
- newDestChildren.filter((x) => x !== '.DS_Store').length > 0
  const isEmpty: boolean =
  await window.core?.api?.isDirectoryEmpty(destFolder)
 
- if (isNotEmpty) {
  if (!isEmpty) {
  setDestinationPath(destFolder)
  showDestNotEmptyConfirm(true)
  return
@@ -74,16 73,7 @@
  if (!destinationPath) return
  try {
  setShowLoader(true)
- const appConfiguration: AppConfiguration =
- await window.core?.api?.getAppConfigurations()
- const currentJanDataFolder = appConfiguration.data_folder
- appConfiguration.data_folder = destinationPath
- const { err } = await fs.syncFile(currentJanDataFolder, destinationPath)
- if (err) throw err
- await window.core?.api?.updateAppConfiguration(appConfiguration)
- console.debug(
- `File sync finished from ${currentJanDataFolder} to ${destinationPath}`
- )
  await window.core?.api?.changeDataFolder(destinationPath)
  localStorage.setItem(SUCCESS_SET_NEW_DESTINATION, 'true')
  setTimeout(() => {
  setShowLoader(false)