Merge branch '536-fr-add-filtersort-options-for-the-tasks-query-results'

Author: RafaelGB

src/components/cellTypes/TaskCell.tsx

@@ -1,6 +1,9 @@
 import { CellComponentProps } from "cdm/ComponentsModel";
 import { Grouping } from "obsidian-dataview/lib/data-model/value";
-import { SListItem } from "obsidian-dataview/lib/data-model/serialized/markdown";
+import {
+  SListItem,
+  STask,
+} from "obsidian-dataview/lib/data-model/serialized/markdown";
 import { DataviewService } from "services/DataviewService";
 import React, { useEffect, useRef } from "react";
 import { TableColumn } from "cdm/FolderModel";
@@ -14,13 +17,14 @@ const TaskCell = (taskProps: CellComponentProps) => {
   useEffect(() => {
     let taskValue = cell.getValue();
     // Check if there are tasks in the cell
-    if (taskValue !== "") {
+    if (taskValue) {
       taskRef.current.innerHTML = "";
+
       if (
         (column.columnDef as TableColumn).config.task_hide_completed &&
-        typeof (taskValue as any).where === "function"
+        DataviewService.getDataviewAPI().isDataArray(taskValue)
       ) {
-        taskValue = (taskValue as any).where((t: any) => !t.completed);
+        taskValue = taskValue.where((t: STask) => !t.completed);
       }
       const taskComponent = new MarkdownRenderChild(taskRef.current);
       DataviewService.getDataviewAPI().taskList(

src/components/headerActions/handlers/buttons/SortHandlerAction.tsx

@@ -4,7 +4,6 @@ import CrossIcon from "components/img/CrossIcon";
 import ArrowUpIcon from "components/img/ArrowUp";
 import ArrowDownIcon from "components/img/ArrowDown";
 import React from "react";
-import { InputType } from "helpers/Constants";
 import { TableColumn } from "cdm/FolderModel";
 import headerButtonComponent from "components/headerActions/HeaderButtonComponent";
 import { t } from "lang/helpers";
@@ -13,17 +12,8 @@ export default class SortHandlerAction extends AbstractHeaderAction {
   globalHeaderActionResponse: HeaderActionResponse;
   handle(headerActionResponse: HeaderActionResponse): HeaderActionResponse {
     this.globalHeaderActionResponse = headerActionResponse;
-    const column = this.globalHeaderActionResponse.headerMenuProps.headerProps
-      .column.columnDef as TableColumn;
-    switch (column.input) {
-      case InputType.TASK:
-      case InputType.INLINKS:
-      case InputType.OUTLINKS:
-        // DO NOTHING
-        break;
-      default:
-        this.addSortButtons();
-    }
+    this.addSortButtons();
+
     return this.goNext(this.globalHeaderActionResponse);
   }
 

src/services/DataviewService.ts

@@ -1,5 +1,5 @@
 import { Notice } from "obsidian";
-import { DataviewApi, getAPI, isPluginEnabled } from "obsidian-dataview";
+import { DataviewApi, getAPI, isPluginEnabled, STask } from "obsidian-dataview";
 import { Literal, WrappedLiteral } from "obsidian-dataview/lib/data-model/value";
 class DataviewProxy {
 
@@ -30,6 +30,15 @@ class DataviewProxy {
         return isPluginEnabled(app);
     }
 
+
+    isStasks(value: Literal): value is STask {
+        return (value as STask).task;
+    }
+
+    isSTaskArray(value: Literal): value is STask[] {
+        return (value as STask[]).every(v => this.isStasks(v));
+    }
+
     /**
      * Singleton instance
      * @returns {VaultManager}

src/services/parseServiceHelpers/SelectParser.ts

@@ -52,7 +52,7 @@ class SelectParser extends TypeParser<string> {
                         .parse(DataviewService.wrapLiteral(curr))
                         .toString()
                 );
-        });
+        }, "");
         return `[${stringArray}]`;
     }
 }

src/services/parseServiceHelpers/SortingParser.ts

@@ -27,46 +27,51 @@ class SortingParser extends TypeParser<Literal> {
     }
 
     private parseToPlainText(wrapped: WrappedLiteral) {
-        let plainText: string;
         switch (wrapped.type) {
             case 'boolean':
             case 'number':
-                plainText = wrapped.value.toString();
-                break;
+                return wrapped.value.toString();
             case 'array':
-                plainText = wrapped.value
+                if (DataviewService.isSTaskArray(wrapped.value)) {
+                    return wrapped.value.reduce((acc, curr) => {
+                        if (!curr.completed) {
+                            acc += 1;
+                        }
+                        return acc
+                    }, 0);
+                }
+                return wrapped.value
                     .map(
                         v => this.parse(
                             DataviewService.wrapLiteral(v),
                         )
                     ).join(', ');
-                break;
             case 'link':
-                plainText = wrapped.value.markdown();
-                break;
+                return wrapped.value.markdown();
             case 'date':
                 if (wrapped.value.hour === 0 && wrapped.value.minute === 0 && wrapped.value.second === 0) {
                     // Parse date
-
-                    plainText = parseLuxonDatetimeToString(wrapped.value, this.config.date_format);
+                    return parseLuxonDatetimeToString(wrapped.value, this.config.date_format);
                 } else {
                     // Parse datetime
-                    plainText = parseLuxonDateToString(wrapped.value, this.config.datetime_format);
+                    return parseLuxonDateToString(wrapped.value, this.config.datetime_format);
                 }
-                break;
             case 'object':
                 if (DateTime.isDateTime(wrapped.value)) {
-                    plainText = this.parse({ type: 'date', value: wrapped.value });
-                } else {
-                    plainText = JSON.stringify(wrapped.value);
+                    return this.parse({ type: 'date', value: wrapped.value });
                 }
-                break;
+
+                if (DataviewService.isStasks(wrapped.value)) {
+                    return wrapped.value.completed ? '0' : '1';
+                }
+
+                return JSON.stringify(wrapped.value);
             default:
-                plainText = wrapped.value?.toString().trim();
+                return wrapped.value?.toString().trim();
         }
-
-        return plainText;
     }
+
+
 }
 
 export default SortingParser;

src/services/parseServiceHelpers/StringifyReplacer.ts

@@ -1,8 +1,5 @@
-import { LocalSettings } from "cdm/SettingsModel";
-import { InputType } from "helpers/Constants";
 import { Literal } from "obsidian-dataview";
 import { DataviewService } from "services/DataviewService";
-import { ParseService } from "services/ParseService";
 
 /**
  * Custom replacer for JSON.stringify to handle DB Folder types

src/services/parseServiceHelpers/TextParser.ts

@@ -54,7 +54,7 @@ class TextParser extends TypeParser<string | DataObject> {
                         .parse(DataviewService.wrapLiteral(curr))
                         .toString()
                 );
-        });
+        }, "");
         return `[${stringArray}]`;
     }
 }