Merge branch 'metadata_filters'

Author: RafaelGB

src/components/modals/filters/handlers/ExistedColumnSelectorComponent.tsx

@@ -53,7 +53,7 @@ const ExistedColumnSelectorComponent = (selectorProps: {
         </optgroup>
         <optgroup label="Metadata Fields">
           <option
-            value={"__filename__"}
+            value={"file.name"}
             key={`MenuItem-Metadata-filename--${level}-${recursiveIndex[level]}`}
           >
             Filename

src/helpers/Constants.ts

@@ -323,12 +323,12 @@ export const EphimeralConfiguration: EphimeralSettings = Object.freeze({
  *                            FILTERS
  ******************************************************************************/
 export const OperatorFilter = Object.freeze({
-  EQUAL: ['EQUAL', '='],
-  NOT_EQUAL: ['NOT_EQUAL', '!='],
-  GREATER_THAN: ['GREATER_THAN', '>'],
-  LESS_THAN: ['LESS_THAN', '<'],
-  GREATER_THAN_OR_EQUAL: ['GREATER_THAN_OR_EQUAL', '>='],
-  LESS_THAN_OR_EQUAL: ['LESS_THAN_OR_EQUAL', '<='],
+  EQUAL: ['EQUAL', 'operator_equal'],
+  NOT_EQUAL: ['NOT_EQUAL', 'operator_not_equal'],
+  GREATER_THAN: ['GREATER_THAN', 'operator_greater_than'],
+  LESS_THAN: ['LESS_THAN', 'operator_less_than'],
+  GREATER_THAN_OR_EQUAL: ['GREATER_THAN_OR_EQUAL', 'operator_greater_than_or_equal'],
+  LESS_THAN_OR_EQUAL: ['LESS_THAN_OR_EQUAL', 'operator_less_than_or_equal'],
   CONTAINS: ['CONTAINS', 'operator_contains'],
   NOT_CONTAINS: ['NOT_CONTAINS', 'operator_does_not_contain'],
   STARTS_WITH: ['STARTS_WITH', 'operator_starts_with'],
@@ -408,7 +408,7 @@ export const DEFAULT_SETTINGS: DatabaseSettings = {
     show_metadata_inlinks: false,
     show_metadata_outlinks: false,
     source_data: SourceDataTypes.CURRENT_FOLDER,
-    source_form_result: 'root',
+    source_form_result: '',
     source_destination_path: '/',
     row_templates_folder: '/',
     current_row_template: '',

src/helpers/TableFiltersHelper.ts

@@ -41,7 +41,12 @@ function validateFilter(p: Record<string, Literal>, filter: FilterGroup, ddbbCon
         }
         return groupResult;
     }
-    const filterableValue = ParseService.parseLiteral(p[(filter as AtomicFilter).field], InputType.MARKDOWN, ddbbConfig);
+    const field = (filter as AtomicFilter).field;
+    let literalToCheck: Literal = field.split('.').reduce((acc, cur) => {
+        return acc[cur];
+    }, p);
+
+    const filterableValue = ParseService.parseLiteral(literalToCheck, InputType.MARKDOWN, ddbbConfig);
     // Atomic filter
     const operator = (filter as AtomicFilter).operator;
     const value = (filter as AtomicFilter).value;

src/helpers/VaultManagement.ts

@@ -127,8 +127,7 @@ export async function sourceDataviewPages(ddbbConfig: LocalSettings, folderPath:
         pagesResult = await obtainQueryResult(
           generateDataviewTableQuery(
             columns,
-            ddbbConfig.source_form_result),
-          folderPath
+            ddbbConfig.source_form_result)
         );
         break;
       case SourceDataTypes.CURRENT_FOLDER_WITHOUT_SUBFOLDERS:
@@ -146,13 +145,13 @@ export async function sourceDataviewPages(ddbbConfig: LocalSettings, folderPath:
   } catch (error) {
     const msg = `Error obtaining pages result. Current folder loaded instead`;
     LOGGER.error(msg, error);
-    new Notice(msg, 10000);
+    new Notice(msg, 4000);
     pagesResult = DataviewService.getDataviewAPI().pages(`"${folderPath}"`);
   }
   return pagesResult;
 }
 
-async function obtainQueryResult(query: string, folderPath: string): Promise<DataArray<Record<string, Literal>>> {
+async function obtainQueryResult(query: string): Promise<DataArray<Record<string, Literal>>> {
   const result = await DataviewService.getDataviewAPI().query(query);
   if (!result.successful || result.value.type !== 'table') {
     throw new Error(`Query ${query} failed`);

src/lang/locale/en.ts

@@ -7,6 +7,12 @@ export default {
   'menu_pane_open_as_db_action': 'Open as database folder',
   'menu_pane_open_as_md_action': 'Open as Markdown',
   /** OPERATOR FILTERS */
+  'operator_equal': '=',
+  'operator_not_equal': '!=',
+  'operator_greater_than': '>',
+  'operator_less_than': '<',
+  'operator_greater_than_or_equal': '>=',
+  'operator_less_than_or_equal': '<=',
   'operator_contains': 'Contains',
   'operator_does_not_contain': 'Does not contain',
   'operator_starts_with': 'Starts with',

src/settings/handlers/source/flavours/TagsSourceBuilder.ts

@@ -46,17 +46,17 @@ export class TagSourceBuilder {
                     });
 
                 cb.inputEl.style.width = "auto";
-            }).addExtraButton((button) => {
-                button.setIcon("cross")
+            }).addButton((button) => {
+                button.setButtonText("Reset")
                     .setTooltip(t("settings_source_form_tag_clear_button_tooltip"))
                     .onClick(async () => {
                         // Clear all tags
                         this.selectedTags = [];
-                        this.initSuggestions();
                         suggester.setSuggestions(this.tagRecords);
                         await this.view.diskConfig.updateConfig({
                             source_form_result: ""
                         });
+                        this.initSuggestions();
                         this.tagsLabel.innerHTML = "None";
                         this.tagsContainer.style.display = "none";
                     });