Fixed logic behind hidden todos

ransome1 · Sep 23, 2023 · 530afa5 · 530afa5
1 parent ec37b1b
commit 530afa5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/main/config.ts b/src/main/config.ts
@@ -40,7 +40,7 @@ const defaultConfigData = {
   files: [],
   appendCreationDate: false,
   showCompleted: true,
-  showHidden: true,
+  showHidden: false,
   windowMaximized: false,
   fileSorting: false,
   convertRelativeToAbsoluteDates: true,

diff --git a/src/main/modules/ProcessDataRequest.ts b/src/main/modules/ProcessDataRequest.ts
@@ -32,9 +32,7 @@ async function processDataRequest(searchString: string): Promise<RequestedData[]
     const fileContent = await fs.promises.readFile(path.join(file.path, '', file.todoFile), 'utf8');
     let todoObjects: TodoObject[];
 
-    todoObjects = await createTodoObjects(fileContent);
-
-    if(!showHidden) todoObjects = handleHiddenTodoObjects(todoObjects);
+    todoObjects = await createTodoObjects(fileContent); 
 
     if(!thresholdDateInTheFuture || !dueDateInTheFuture) todoObjects = handleTodoObjectsDates(todoObjects, dueDateInTheFuture, thresholdDateInTheFuture);
 
@@ -44,6 +42,8 @@ async function processDataRequest(searchString: string): Promise<RequestedData[]
 
     updateAttributes(todoObjects, sorting, true);
 
+    if(!showHidden) todoObjects = handleHiddenTodoObjects(todoObjects);
+
     if (filters) todoObjects = applyFilters(todoObjects, filters);
 
     if (searchString) todoObjects = applySearchString(searchString, todoObjects);

diff --git a/src/renderer/SplashScreen.js b/src/renderer/SplashScreen.js
@@ -33,7 +33,7 @@ const SplashScreen = ({ screen, setSearchString, setDialogOpen }) => {
       {screen === 'noTodosVisible' && (
         <>
           <FontAwesomeIcon icon={faHippo} />
-          <p>No results found for either your search input nor your selected filters</p>
+          <p>No results found. Check your selected filters, filter settings or search input.</p>
           <Box className="buttons">
             <Button variant='contained' onClick={handleReset}>
               Reset filters and search