Merge branch 'master' into 61-bug-accessor-key-and-label-needs-to-be-edited-without-the-ui-and-yaml-in-existing-files-shifts-around

Author: RafaelGB

docs/docs/changelog.md

@@ -1,3 +1,8 @@
+## 1.3.1
+### No longer broken
+- dataview currently supports multiple key with same name and is considered as an array. Actually this kind of array generates an error in the database plugin. Now are controlled taking just the fist hit. It will be considered as an array with future versions.
+- Add new label to selected cell type is duplicated no more. Introduced with 1.3.0 [ISSUE#64](https://github.com/RafaelGB/obsidian-db-folder/issues/64)
+
 ## 1.3.0
 *Published on 2022/05/23*
 ### Shiny new things

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "dbfolder",
 	"name": "DB Folder",
-	"version": "1.3.0",
+	"version": "1.3.1",
 	"minAppVersion": "0.14.6",
 	"description": "Folder with the capability to store and retrieve data from a folder like database",
 	"author": "RafaelGB",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-dbfolder",
-	"version": "1.3.0",
+	"version": "1.3.1",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

src/components/reducers/DatabaseDispatch.tsx

@@ -54,7 +54,7 @@ export function databaseReducer(state: TableDataType, action: ActionType) {
         columns: {
           [optionIndex]: {
             options: {
-              $push: [newOption],
+              $set: state.columns[optionIndex].options,
             },
           },
         },

src/services/DataviewService.ts

@@ -5,6 +5,7 @@ import { getAPI, isPluginEnabled } from "obsidian-dataview";
 import { Literal, WrappedLiteral } from "obsidian-dataview/lib/data-model/value";
 import { DvAPIInterface } from "obsidian-dataview/lib/typings/api";
 import { DateTime } from "luxon";
+import { LOGGER } from "services/Logger";
 class DataviewProxy {
 
     private static instance: DataviewProxy;
@@ -62,10 +63,19 @@ class DataviewProxy {
 
     parseLiteral(literal: Literal, dataTypeDst: string): Literal {
         let parsedLiteral: Literal = literal;
-        const wrapped = this.getDataviewAPI().value.wrapValue(literal)
-        if (wrapped.value === undefined || wrapped.value === null) {
+        if (!this.getDataviewAPI().value.isTruthy(literal)) {
             return "";
         }
+
+        if ((literal as any).values !== undefined) {
+
+            literal = (literal as any).values[0];
+            LOGGER.warn(`There is a repeated key into a file with this values: ${(literal as any).values[0]
+                }`);
+        }
+
+        const wrapped = this.getDataviewAPI().value.wrapValue(literal)
+
         // Check empty or undefined literals
         switch (dataTypeDst) {
             case DataTypes.CALENDAR:
@@ -76,8 +86,9 @@ class DataviewProxy {
                 parsedLiteral = wrapped.type === 'number' ? literal : Number(literal);
                 break;
             default:
-                // Values of dataview parse to md friendly strings
+
                 if (DateTime.isDateTime(wrapped.value)) {
+                    // Values of dataview parse to md friendly strings
                     parsedLiteral = wrapped.value.toFormat("yyyy-MM-dd");
                 } else {
                     parsedLiteral = this.getDataviewAPI().value.toString(literal);