Add debounced arc read to file watcher ✨

nfdi4plants · Nov 22, 2023 · 603f967 · 603f967
1 parent 39bf9ca
commit 603f967
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 13 deletions.
diff --git a/packages/renderer/src/ArcControlService.ts b/packages/renderer/src/ArcControlService.ts
@@ -31,10 +31,11 @@ function relativePath_to_absolute(relativePath: string) {
   return ArcControlService.props.arc_root + '/' + relativePath
 }
 
-const ArcControlService = {
 
+const ArcControlService = {
+
   props: reactive(init),
-
+  
   closeARC: async() => {
     ArcControlService.props.arc_root = null;
     ArcControlService.props.busy = false;
@@ -44,18 +45,18 @@ const ArcControlService = {
     AppProperties.state = 0;
     return;
   },
-
+  
   readARC: async (arc_root: string | void | null) =>{
-    if(!arc_root)
+      if(!arc_root)
       arc_root = ArcControlService.props.arc_root;
     if(!arc_root)
-      return;
+    return;
 
     const isARC = await window.ipc.invoke('LocalFileSystemService.exists', arc_root+'/isa.investigation.xlsx');
 
     if (!isARC) {
-        ArcControlService.closeARC();
-        return false;
+      ArcControlService.closeARC();
+      return false;
     }
 
     ArcControlService.props.busy = true;

diff --git a/packages/renderer/src/views/ArcTreeView.vue b/packages/renderer/src/views/ArcTreeView.vue
@@ -311,9 +311,26 @@ const onSelectionChanged = id =>{
   }
 };
 
+const asyncDebounce = (mainFunction, delay) => {
+  // Declare a variable called 'timer' to store the timer ID
+  let timer: NodeJS.Timeout;
+  
+  // Return an anonymous function that takes in any number of arguments
+  return function (...args) {
+    // Clear the previous timer to prevent the execution of 'mainFunction'
+    clearTimeout(timer);
+
+    // Set a new timer that will execute 'mainFunction' after the specified delay
+    timer = setTimeout(async () => {
+      await mainFunction(...args);
+    }, delay);
+  };
+};
+
+const debounceReadARC = asyncDebounce(ArcControlService.readARC, 300);
+
 const updatePath = async path => {
-  console.log("updatePath", path)
-  console.log("arcTree", arcTree)
+  debounceReadARC();
   if (!arcTree.value)
     return;
   const n = arcTree._value.getNodeByKey(path);

diff --git a/packages/renderer/src/views/AssayView.vue b/packages/renderer/src/views/AssayView.vue
@@ -13,7 +13,10 @@ const iProps = reactive({
 
 const init = async ()=>{
   if(!ArcControlService.props.arc || !AppProperties.active_assay) return;
-  iProps.assay = ArcControlService.props.arc.ISA.GetAssay(AppProperties.active_assay);
+
+  const assay = ArcControlService.props.arc.ISA.TryGetAssay(AppProperties.active_assay);
+  if (!assay) return; 
+  iProps.assay = assay
 };
 
 onMounted( init );

diff --git a/packages/renderer/src/views/StudyView.vue b/packages/renderer/src/views/StudyView.vue
@@ -18,9 +18,11 @@ const iProps = reactive({
 const init = async ()=>{
   if(!ArcControlService.props.arc || !AppProperties.active_study) return;
 
-  iProps.study = ArcControlService.props.arc.ISA.GetStudy(AppProperties.active_study);
-  iProps.people = iProps.study.Contacts;
-  iProps.publications = iProps.study.Publications;
+  const study = ArcControlService.props.arc.ISA.TryGetStudy(AppProperties.active_study);
+  if (!study) return;
+  iProps.study = study
+  iProps.people = study.Contacts;
+  iProps.publications = study.Publications;
 };
 
 onMounted( init );