Merge branch 'parsing_between_improvements'

Author: RafaelGB

src/helpers/VaultManagement.ts

@@ -170,5 +170,9 @@ async function obtainQueryResult(query: string, folderPath: string): Promise<Dat
   }
 }
 
-
-
+export function obtainCellFromFile(path: string, column: TableColumn): Literal {
+  const page = DataviewService.getDataviewAPI().page(path) as NoteInfoPage;
+  const noteInfo = new NoteInfo(page);
+  const uniqueRowValue = noteInfo.getRowDataType([column]);
+  return uniqueRowValue[column.id] as Literal;
+}

src/lang/locale/en.ts

@@ -317,9 +317,11 @@ export default {
   "settings_source_title": "Select the source of database data",
   "settings_source_desc": "Select from which source you want to get the data to be displayed in the table.",
   "settings_source_form_title": "Form in function of source data",
-  "settings_source_form_tag_title": "Select a tag",
-  "settings_source_form_tag_desc": "Select a tag to use as source of data",
+  "settings_source_form_tag_title": "Data Source Tags",
+  "settings_source_form_tag_desc": "Select the tags you want as data source. You can add multiple tags.",
   "settings_source_form_tag_placeholder": "Select a tag...",
+  "settings_source_form_tag_clear_button_tooltip": "Clear all tags",
+  "settings_source_form_tag_selected": "Selected Tags: ",
   "settings_source_form_file_title": "Select a file",
   "settings_source_form_file_desc": "Select a file to use as source of data",
   "settings_source_form_file_placeholder": "Example: folder1/template_file",

src/lang/locale/es.ts

@@ -320,6 +320,8 @@ export default {
     "settings_source_form_tag_title": "Seleccionar una etiqueta",
     "settings_source_form_tag_desc": "Seleccionar una etiqueta para usar como fuente de datos",
     "settings_source_form_tag_placeholder": "Ejemplo: #tag",
+    "settings_source_form_tag_clear_button_tooltip": "Limpiar todas las etiquetas",
+    "settings_source_form_tag_selected": "Etiquetas seleccionadas",
     "settings_source_form_file_title": "Seleccionar un archivo",
     "settings_source_form_file_desc": "Seleccionar un archivo para usar como fuente de datos",
     "settings_source_form_file_placeholder": "Buscar archivo...",

src/lang/locale/fr.ts

@@ -320,6 +320,8 @@ export default {
   "settings_source_form_tag_title": "Sélectionner un tag",
   "settings_source_form_tag_desc": "Sélectionner un tag à utiliser comme source de données.",
   "settings_source_form_tag_placeholder": "Sélectionner un tag...",
+  "settings_source_form_tag_clear_button_tooltip": "Effacer le tag sélectionné",
+  "settings_source_form_tags_selected": "Tags sélectionnés :",
   "settings_source_form_file_title": "Sélectionner un fichier",
   "settings_source_form_file_desc": "Sélectionner un fichier à utiliser comme source de données.",
   "settings_source_form_file_placeholder": "Exemple : fichier1/fichier_modèle",

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

@@ -23,14 +23,14 @@ export class TagSourceBuilder {
         let suggester: StringSuggest;
 
         new Setting(this.containerEl)
-            .setName("Data Source Tags")
-            .setDesc("Select the tags you want as data source. You can add multiple tags.")
+            .setName(t("settings_source_form_tag_title"))
+            .setDesc(t("settings_source_form_tag_desc"))
             .addSearch((cb) => {
                 suggester = new StringSuggest(
                     cb.inputEl,
                     this.tagRecords
                 );
-                cb.setPlaceholder("Select a tag")
+                cb.setPlaceholder(t("settings_source_form_tag_placeholder"))
                     .onChange(async (value: string): Promise<void> => {
                         if (value && this.tagRecords[value]) {
                             // update settings
@@ -47,7 +47,7 @@ export class TagSourceBuilder {
                 cb.inputEl.style.width = "auto";
             }).addExtraButton((button) => {
                 button.setIcon("cross")
-                    .setTooltip("Clear all tags")
+                    .setTooltip(t("settings_source_form_tag_clear_button_tooltip"))
                     .onClick(async () => {
                         // Clear all tags
                         this.selectedTags = [];
@@ -67,7 +67,7 @@ export class TagSourceBuilder {
     private configureTagDisplay = () => {
         this.tagsContainer = this.containerEl.createEl("div");
         const label = this.containerEl.createEl("span", {
-            text: "Selected Tags: ",
+            text: t("settings_source_form_tag_selected"),
         });
         label.style.color = "#666";
         this.tagsContainer.appendChild(label);

src/stateManagement/data/handlers/ParseDataOfColumnHandlerAction.ts

@@ -1,6 +1,7 @@
 import { TableColumn } from "cdm/FolderModel";
 import { LocalSettings } from "cdm/SettingsModel";
 import { DataState, TableActionResponse } from "cdm/TableStateInterface";
+import { obtainCellFromFile } from "helpers/VaultManagement";
 import { ParseService } from "services/ParseService";
 import { AbstractTableAction } from "stateManagement/AbstractTableAction";
 
@@ -10,6 +11,9 @@ export default class ParseDataOfColumnHandlerAction extends AbstractTableAction<
         implementation.actions.parseDataOfColumn = (column: TableColumn, input: string, ddbbConfig: LocalSettings) =>
             set((updater) => {
                 const parsedRows = updater.rows.map((row) => {
+                    // Recover original value
+                    const dvCell = obtainCellFromFile(row.__note__.filepath, column);
+                    row[column.key] = dvCell;
                     // Transform the input into the target type
                     const parsedValue = ParseService.parseRowToCell(
                         row,