Merge branch 'master' into 377-bug-when-using-the-data-view-query-as-source-you-cant-seem-to-add-existing-columns

RafaelGB · RafaelGB · commit 295409244070 · 2022-09-15T21:19:58.000+02:00
diff --git a/src/cdm/FolderModel.ts b/src/cdm/FolderModel.ts
@@ -39,7 +39,7 @@ export interface ConfigColumn {
     media_width: number;
     media_height: number;
     isInline: boolean;
-    content_alignment: string;
+    content_alignment?: string;
     task_hide_completed?: boolean;
     formula_query?: string;
     persist_formula?: boolean;
diff --git a/src/cdm/SettingsModel.ts b/src/cdm/SettingsModel.ts
@@ -41,6 +41,8 @@ export interface LocalSettings {
     formula_folder_path: string;
     inline_default: boolean;
     inline_new_position: string;
+    date_format: string;
+    datetime_format: string;
 }
 
 export interface FilterSettings {
diff --git a/src/components/cellTypes/FormulaCell.tsx b/src/components/cellTypes/FormulaCell.tsx
@@ -1,7 +1,7 @@
 import { CellComponentProps } from "cdm/ComponentsModel";
 import { TableColumn } from "cdm/FolderModel";
 import { renderMarkdown } from "components/obsidianArq/MarkdownRenderer";
-import { c } from "helpers/StylesHelper";
+import { c, getAlignmentClassname } from "helpers/StylesHelper";
 import React, { useEffect, useRef } from "react";
 
 const FormulaCell = (mdProps: CellComponentProps) => {
@@ -46,7 +46,9 @@ const FormulaCell = (mdProps: CellComponentProps) => {
   return (
     <span
       ref={formulaRef}
-      className={`${c("md_cell " + tableColumn.config.content_alignment)}`}
+      className={`${c(
+        "md_cell " + getAlignmentClassname(tableColumn.config.content_alignment)
+      )}`}
       key={`formula_${cell.id}`}
     />
   );
diff --git a/src/components/cellTypes/NumberCell.tsx b/src/components/cellTypes/NumberCell.tsx
@@ -1,6 +1,6 @@
 import { CellComponentProps } from "cdm/ComponentsModel";
 import { TableColumn } from "cdm/FolderModel";
-import { c } from "helpers/StylesHelper";
+import { c, getAlignmentClassname } from "helpers/StylesHelper";
 import React, {
   ChangeEventHandler,
   KeyboardEventHandler,
@@ -61,11 +61,11 @@ const NumberCell = (props: CellComponentProps) => {
       onChange={handleOnChange}
       onKeyDown={handleKeyDown}
       onBlur={handleOnBlur}
-      className={c(tableColumn.config.content_alignment)}
+      className={c(getAlignmentClassname(tableColumn.config.content_alignment))}
     />
   ) : (
     <span
-      className={c(tableColumn.config.content_alignment)}
+      className={c(getAlignmentClassname(tableColumn.config.content_alignment))}
       onClick={handleEditableOnclick}
       style={{ width: column.getSize() }}
     >
diff --git a/src/components/cellTypes/TextCell.tsx b/src/components/cellTypes/TextCell.tsx
@@ -4,7 +4,7 @@ import React, { MouseEventHandler, useEffect, useRef } from "react";
 import { useState } from "react";
 import EditorCell from "components/cellTypes/EditorCell";
 import { TableColumn } from "cdm/FolderModel";
-import { c } from "helpers/StylesHelper";
+import { c, getAlignmentClassname } from "helpers/StylesHelper";
 
 const TextCell = (props: CellComponentProps) => {
   const { defaultCell } = props;
@@ -73,7 +73,7 @@ const TextCell = (props: CellComponentProps) => {
       ref={containerCellRef}
       onClick={handleEditableOnclick}
       style={{ width: column.getSize() }}
-      className={c(tableColumn.config.content_alignment)}
+      className={c(getAlignmentClassname(tableColumn.config.content_alignment))}
     />
   );
 };
diff --git a/src/components/portals/CalendarPortal.tsx b/src/components/portals/CalendarPortal.tsx
@@ -69,7 +69,9 @@ const CalendarPortal = (calendarProps: CellComponentProps) => {
       style={{ width: column.getSize() }}
     >
       {DateTime.isDateTime(calendarValue)
-        ? (calendarValue as unknown as DateTime).toFormat("yyyy-MM-dd")
+        ? (calendarValue as unknown as DateTime).toFormat(
+            configInfo.getLocalSettings().date_format
+          )
         : null}
     </span>
   );
diff --git a/src/components/portals/CalendarTimePortal.tsx b/src/components/portals/CalendarTimePortal.tsx
@@ -50,7 +50,7 @@ const CalendarTimePortal = (calendarTimeProps: CellComponentProps) => {
     (tableColumn.isMetadata === undefined || !tableColumn.isMetadata) ? (
     <div className="calendar-time">
       <DatePicker
-        dateFormat="yyyy-MM-dd h:mm aa"
+        dateFormat={configInfo.getLocalSettings().datetime_format}
         selected={
           DateTime.isDateTime(calendarTimeState)
             ? (calendarTimeState as unknown as DateTime).toJSDate()
@@ -72,7 +72,9 @@ const CalendarTimePortal = (calendarTimeProps: CellComponentProps) => {
     <div onClick={handleSpanOnClick}>
       <span className="calendar-time" style={{ width: column.getSize() }}>
         {DateTime.isDateTime(calendarTimeState)
-          ? (calendarTimeState as DateTime).toFormat("yyyy-MM-dd h:mm a")
+          ? (calendarTimeState as DateTime).toFormat(
+              configInfo.getLocalSettings().datetime_format
+            )
           : null}
       </span>
     </div>
diff --git a/src/helpers/Constants.ts b/src/helpers/Constants.ts
@@ -86,8 +86,7 @@ export const DEFAULT_COLUMN_CONFIG: ConfigColumn = Object.freeze({
   media_width: 100,
   media_height: 100,
   isInline: false,
-  task_hide_completed: true,
-  content_alignment: COLUMN_ALIGNMENT_OPTIONS.LEFT,
+  task_hide_completed: true
 });
 
 export const MetadataDatabaseColumns: MetadataColumnsModel = Object.freeze({
@@ -370,6 +369,8 @@ export const DEFAULT_SETTINGS: DatabaseSettings = {
     formula_folder_path: '/',
     inline_default: false,
     inline_new_position: INLINE_POSITION.TOP,
+    date_format: 'yyyy-MM-dd',
+    datetime_format: 'yyyy-MM-dd HH:mm:ss',
   }
 };
 /******************************************************************************
diff --git a/src/helpers/StylesHelper.ts b/src/helpers/StylesHelper.ts
@@ -39,4 +39,8 @@ export function getLabelHeader(input: string) {
         }
     });
     return labelCandidate === undefined ? input : labelCandidate[1];
+}
+
+export function getAlignmentClassname(alignment: string) {
+    return alignment === undefined ? COLUMN_ALIGNMENT_OPTIONS.LEFT : alignment;
 }
diff --git a/src/parsers/handlers/marshall/MarshallColumnsHandler.ts b/src/parsers/handlers/marshall/MarshallColumnsHandler.ts
@@ -68,9 +68,6 @@ export class MarshallColumnsHandler extends AbstractYamlHandler {
                     if (column.config.isInline === undefined) {
                         column.config.isInline = DEFAULT_COLUMN_CONFIG.isInline;
                     }
-                    if (column.config.content_alignment === undefined) {
-                        column.config.content_alignment = DEFAULT_COLUMN_CONFIG.content_alignment;
-                    }
                     column = marshallParticularConfigInfo(column);
                 }
                 // Update mashaller response
diff --git a/src/services/DataviewService.ts b/src/services/DataviewService.ts
@@ -101,7 +101,11 @@ class DataviewProxy {
                 parsedLiteral = this.parseToOptionsArray(wrapped);
                 break;
             case InputType.CALENDAR:
+                parsedLiteral = this.parseToCalendar(wrapped, localSettings.date_format);
+                break;
             case InputType.CALENDAR_TIME:
+                parsedLiteral = this.parseToCalendar(wrapped, localSettings.datetime_format);
+                break;
             case InputType.METATADA_TIME:
                 parsedLiteral = this.parseToCalendar(wrapped);
                 break;
@@ -144,9 +148,16 @@ class DataviewProxy {
         return this.instance;
     }
 
-    private parseToCalendar(wrapped: WrappedLiteral): DateTime {
+    private parseToCalendar(wrapped: WrappedLiteral, format?: string): DateTime {
+        console.log(wrapped);
         if (wrapped.type === 'string') {
-            const calendarCandidate = DateTime.fromISO(wrapped.value);
+            let calendarCandidate;
+            if (format) {
+                calendarCandidate = DateTime.fromFormat(wrapped.value, format);
+            } else {
+                calendarCandidate = DateTime.fromISO(wrapped.value);
+            }
+
             if (calendarCandidate.isValid) {
                 return calendarCandidate;
             }
@@ -205,10 +216,10 @@ class DataviewProxy {
             case 'date':
                 if (wrapped.value.hour === 0 && wrapped.value.minute === 0 && wrapped.value.second === 0) {
                     // Parse date
-                    auxMarkdown = wrapped.value.toFormat("yyyy-MM-dd");
+                    auxMarkdown = wrapped.value.toFormat(localSettings.date_format);
                 } else {
                     // Parse datetime
-                    auxMarkdown = wrapped.value.toISO()
+                    auxMarkdown = wrapped.value.toFormat(localSettings.datetime_format);
                     auxMarkdown = this.handleMarkdownBreaker(auxMarkdown, localSettings, isInline);
                 }
                 break;
diff --git a/src/settings/EditingEngineSection.ts b/src/settings/EditingEngineSection.ts
@@ -3,6 +3,7 @@ import { SettingHandlerResponse } from "settings/handlers/AbstractSettingHandler
 import { add_setting_header } from "settings/SettingsComponents";
 import { FrontmatterQuotesToggleHandler } from "settings/handlers/editingEngine/FrontmatterQuotesToggleHandler";
 import { AbstractHandler } from "patterns/AbstractHandler";
+import { DateFormatHandler } from "settings/handlers/editingEngine/DateFormatHandler";
 
 class EditingEngineSetttingsSection extends AbstractChain<SettingHandlerResponse> {
     protected customHandle(settingHandlerResponse: SettingHandlerResponse): SettingHandlerResponse {
@@ -14,7 +15,8 @@ class EditingEngineSetttingsSection extends AbstractChain<SettingHandlerResponse
     }
     protected getHandlers(): AbstractHandler<SettingHandlerResponse>[] {
         return [
-            new FrontmatterQuotesToggleHandler()
+            new FrontmatterQuotesToggleHandler(),
+            new DateFormatHandler()
         ]
     }
 }
diff --git a/src/settings/handlers/editingEngine/DateFormatHandler.ts b/src/settings/handlers/editingEngine/DateFormatHandler.ts
@@ -0,0 +1,77 @@
+import { DEFAULT_SETTINGS } from "helpers/Constants";
+import { AbstractSettingsHandler, SettingHandlerResponse } from "settings/handlers/AbstractSettingHandler";
+import { add_text } from "settings/SettingsComponents";
+
+export class DateFormatHandler extends AbstractSettingsHandler {
+    settingTitle: string = 'Date format';
+    handle(settingHandlerResponse: SettingHandlerResponse): SettingHandlerResponse {
+        const { settingsManager, containerEl, local, view } = settingHandlerResponse;
+        /*************
+         * DATE FORMAT
+         *************/
+        const date_promise = async (value: string): Promise<void> => {
+            if (local) {
+                // update settings
+                view.diskConfig.updateConfig({ date_format: value });
+            } else {
+                // set dropdown value
+                const update_local_settings = settingsManager.plugin.settings.local_settings;
+                update_local_settings.date_format = value;
+                // update settings
+                settingsManager.plugin.updateSettings({ local_settings: update_local_settings });
+            }
+        }
+        add_text(
+            containerEl,
+            "Date format",
+            "The format of the date.",
+            "yyyy-mm-dd",
+            current_date_format(
+                local,
+                view.diskConfig.yaml.config.date_format,
+                settingsManager.plugin.settings.local_settings.date_format
+            ),
+            date_promise
+        );
+        /*****************
+         * DATETIME FORMAT
+         *****************/
+        const datetime_promise = async (value: string): Promise<void> => {
+            if (local) {
+                // update settings
+                view.diskConfig.updateConfig({ datetime_format: value });
+            } else {
+                // set dropdown value
+                const update_local_settings = settingsManager.plugin.settings.local_settings;
+                update_local_settings.datetime_format = value;
+                // update settings
+                settingsManager.plugin.updateSettings({ local_settings: update_local_settings });
+            }
+        }
+        add_text(
+            containerEl,
+            "Datetime format",
+            "The format of the datetime.",
+            "yyyy-mm-dd hh:mm:ss",
+            current_datetime_format(
+                local,
+                view.diskConfig.yaml.config.datetime_format,
+                settingsManager.plugin.settings.local_settings.datetime_format
+            ),
+            datetime_promise
+        );
+        return this.goNext(settingHandlerResponse);
+    }
+}
+
+function current_date_format(local: boolean, tableValue: string, default_value: string) {
+    return local ?
+        (tableValue ?? DEFAULT_SETTINGS.local_settings.date_format) :
+        (default_value ?? DEFAULT_SETTINGS.local_settings.date_format);
+}
+
+function current_datetime_format(local: boolean, tableValue: string, default_value: string) {
+    return local ?
+        (tableValue ?? DEFAULT_SETTINGS.local_settings.datetime_format) :
+        (default_value ?? DEFAULT_SETTINGS.local_settings.datetime_format);
+}

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ export interface LocalSettings {`
`41`	`41`	`formula_folder_path: string;`
`42`	`42`	`inline_default: boolean;`
`43`	`43`	`inline_new_position: string;`
	`44`	`+ date_format: string;`
	`45`	`+ datetime_format: string;`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`export interface FilterSettings {`
Original file line number	Diff line number	Diff line change
`@@ -39,4 +39,8 @@ export function getLabelHeader(input: string) {`
`39`	`39`	`}`
`40`	`40`	`});`
`41`	`41`	`return labelCandidate === undefined ? input : labelCandidate[1];`
	`42`	`+}`
	`43`	`+`
	`44`	`+export function getAlignmentClassname(alignment: string) {`
	`45`	`+ return alignment === undefined ? COLUMN_ALIGNMENT_OPTIONS.LEFT : alignment;`
`42`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,9 +68,6 @@ export class MarshallColumnsHandler extends AbstractYamlHandler {`
`68`	`68`	`if (column.config.isInline === undefined) {`
`69`	`69`	`column.config.isInline = DEFAULT_COLUMN_CONFIG.isInline;`
`70`	`70`	`}`
`71`		`- if (column.config.content_alignment === undefined) {`
`72`		`- column.config.content_alignment = DEFAULT_COLUMN_CONFIG.content_alignment;`
`73`		`- }`
`74`	`71`	`column = marshallParticularConfigInfo(column);`
`75`	`72`	`}`
`76`	`73`	`// Update mashaller response`