fix(pending): Pending list sync

Author: walkthunder

src/components/PendingStatsView.tsx

@@ -8,14 +8,12 @@ import useStore, { LogType } from './pendingStore';
 import styles from './PendingStatsView.module.css';
 import { AlertTriangle, CheckCircle, ArrowDownUp, Activity, LineChart, Cog, Siren, FileType, ScrollText, Info, AlertCircle, XCircle, ChevronRight, Terminal, RedoDot, UploadCloud, DownloadCloud } from 'lucide-react';
 import { log } from '../moreOnLog'
-import { Utils } from '../utils/utils';
-import { Notice } from "obsidian";
 import Logo from './InvioLogo';
 import InvioPlugin from "src/main";
 import { CheckSettingsModal } from './CheckSettingsModal';
 
 export const PendingStatsViewComponent = (props: { plugin: InvioPlugin }) => {
-    const { record, toLocalSelected, toRemoteSelected, getToLocalFileList, getToRemoteFileList, existToLocalFile, existToRemoteFile, updateSelectedToLocalFileList, updateSelectedToRemoteFileList } = useStore();
+    const { record, toLocalSelected, toRemoteSelected, getToLocalFileList, getToRemoteFileList, getAllCheckedFileList, existToLocalFile, existToRemoteFile, updateSelectedToLocalFileList, updateSelectedToRemoteFileList } = useStore();
     const toLocalTouched = getToLocalFileList();
 
     const toRemoteTouched = getToRemoteFileList();
@@ -51,15 +49,15 @@ export const PendingStatsViewComponent = (props: { plugin: InvioPlugin }) => {
     }
 
     const onToLocalCheck: TreeProps['onCheck'] = (checkedKeys: string[], info: any) => {
-        updateSelectedToLocalFileList(checkedKeys.filter(key => toLocalTouched.find(t => t.key === key)))
+        updateSelectedToLocalFileList(checkedKeys)
     };
 
     const onToRemoteCheck: TreeProps['onCheck'] = (checkedKeys: string[], info: any) => {
-        updateSelectedToRemoteFileList(checkedKeys.filter(key => toRemoteTouched.find(t => t.key === key)))
+        updateSelectedToRemoteFileList(checkedKeys)
     };
 
     const startSync = async () => {
-        await props.plugin.syncRun('manual', [...toLocalSelected, ...toRemoteSelected])
+        await props.plugin.syncRun('manual', getAllCheckedFileList())
     }
 
     const openSettings = () => {

src/components/pendingStore.ts

@@ -26,6 +26,9 @@ interface State {
   init: (data: Record<string, FileOrFolderMixedState>, logs?: LogItem[]) => void;
   getToLocalFileList: () => FileOrFolderMixedState[];
   getToRemoteFileList: () => FileOrFolderMixedState[];
+  getAllCheckedFileList: () => string[];
+  getToLocalFileListFlat: () => FileOrFolderMixedState[];
+  getToRemoteFileListFlat: () => FileOrFolderMixedState[];
   existToLocalFile: (path: string) => boolean;
   existToRemoteFile: (path: string) => boolean;
   updateSelectedToLocalFileList: (list: string[]) => string[];
@@ -86,13 +89,28 @@ const useStore = create<State>()((set, get) => ({
       toRemoteSelected: [],
     })
   },
+  getToLocalFileListFlat: () => {
+    const obj = get().record;
+    const list = Object.keys(obj)
+      .filter(key => obj[key].syncType === 'TOLOCAL')
+      .map(key => obj[key])
+    return list
+  },
   getToLocalFileList: () => {
     const obj = get().record;
     const list = Object.keys(obj)
       .filter(key => obj[key].syncType === 'TOLOCAL')
       .map(key => obj[key])
     return convertList(list) as FileOrFolderMixedState[]
   },
+  getToRemoteFileListFlat: () => {
+    const obj = get().record;
+    const list = Object.keys(obj)
+      .filter(key => obj[key].syncType === 'TOREMOTE')
+      .map(key => obj[key])
+
+    return list
+  },
   getToRemoteFileList: () => {
     const obj = get().record;
     const list = Object.keys(obj)
@@ -102,6 +120,10 @@ const useStore = create<State>()((set, get) => ({
     return convertList(list) as FileOrFolderMixedState[]
   },
 
+  getAllCheckedFileList: () => {
+    return [ ...get().toLocalSelected, ...get().toRemoteSelected ]
+  },
+
   existToLocalFile: (filePath: string) => {
     const obj = get().record;
     return !!Object.keys(obj).filter(key => obj[key].syncType === 'TOLOCAL').find(key => key === filePath)
@@ -114,14 +136,16 @@ const useStore = create<State>()((set, get) => ({
   },
 
   updateSelectedToLocalFileList: (list: string[]) => {
+    const toRemoteList = get().getToLocalFileListFlat();
     set({
-      toLocalSelected: list || []
+      toLocalSelected: (list || []).filter((p: string) => toRemoteList.find(item => item.key === p))
     })
     return get().toLocalSelected
   },
   updateSelectedToRemoteFileList: (list: string[]) => {
+    const toRemoteList = get().getToRemoteFileListFlat();
     set({
-      toRemoteSelected: list || []
+      toRemoteSelected: (list || []).filter((p: string) => toRemoteList.find(item => item.key === p))
     })
     return get().toRemoteSelected
   },