Merge branch '323-select-column-tag-column-organization'

Author: RafaelGB

src/components/portals/PopperSelectPortal.tsx

@@ -142,19 +142,21 @@ const PopperSelectPortal = (popperProps: CellComponentProps) => {
               className="d-flex flex-wrap-wrap"
               style={{ marginTop: "-0.5rem" }}
             >
-              {tableColumn.options.map((option: any) => (
-                <div
-                  key={option.label}
-                  className="cursor-pointer"
-                  style={{ marginRight: "0.5rem", marginTop: "0.5rem" }}
-                  onClick={() => handleOptionClick(option)}
-                >
-                  <Relationship
-                    value={option.label}
-                    backgroundColor={option.backgroundColor}
-                  />
-                </div>
-              ))}
+              {tableColumn.options
+                .sort((a, b) => a.label.localeCompare(b.label))
+                .map((option) => (
+                  <div
+                    key={option.label}
+                    className="cursor-pointer"
+                    style={{ marginRight: "0.5rem", marginTop: "0.5rem" }}
+                    onClick={() => handleOptionClick(option)}
+                  >
+                    <Relationship
+                      value={option.label}
+                      backgroundColor={option.backgroundColor}
+                    />
+                  </div>
+                ))}
               {showAdd && (
                 <div
                   style={{

src/components/portals/TagsPortal.tsx

@@ -61,11 +61,14 @@ const TagsPortal = (tagsProps: CellComponentProps) => {
     color: getColor(tag),
   }));
 
-  const multiOptions = tableColumn.options.map((option: RowSelectOption) => ({
-    value: option.label,
-    label: option.label,
-    color: option.backgroundColor,
-  }));
+  const multiOptions = tableColumn.options
+    .sort((a, b) => a.label.localeCompare(b.label))
+    .map((option: RowSelectOption) => ({
+      value: option.label,
+      label: option.label,
+      color: option.backgroundColor,
+    }));
+
   const handleOnChange = (
     newValue: OnChangeValue<any, true>,
     actionMeta: ActionMeta<RowSelectOption>
@@ -125,15 +128,17 @@ const TagsPortal = (tagsProps: CellComponentProps) => {
               onClick={() => setShowSelectTags(true)}
               style={{ width: column.getSize() }}
             >
-              {tagsState.map((tag: string) => (
-                <div key={`key-${tag}`}>
-                  <Relationship
-                    key={`key-Relationship-${tag}`}
-                    value={tag}
-                    backgroundColor={getColor(tag)}
-                  />
-                </div>
-              ))}
+              {tagsState
+                .sort((a: string, b: string) => a.localeCompare(b))
+                .map((tag: string) => (
+                  <div key={`key-${tag}`}>
+                    <Relationship
+                      key={`key-Relationship-${tag}`}
+                      value={tag}
+                      backgroundColor={getColor(tag)}
+                    />
+                  </div>
+                ))}
             </div>
           )}
     </>

src/lang/locale/en.ts

@@ -16,4 +16,10 @@ export default {
   'toolbar_menu_aria_label': 'Open table options',
   'toolbar_menu_export_csv': 'Export CSV',
   'toolbar_menu_import_csv': 'Import CSV',
+  /** SOURCE OPTIONS */
+  'current_folder': "Current folder",
+  "tag": "Tag",
+  "outgoing_link": "Outgoing link",
+  "incoming_link": "Incoming link",
+  "query": "Dataview query",
 };

src/lang/locale/es.ts

@@ -16,4 +16,10 @@ export default {
     'toolbar_menu_aria_label': 'Abrir opciones de tabla',
     'toolbar_menu_export_csv': 'Exportar CSV',
     'toolbar_menu_import_csv': 'Importar CSV',
+    /** SOURCE OPTIONS */
+    'current_folder': "Carpeta actual",
+    "tag": "Etiqueta",
+    "outgoing_link": "Enlace saliente",
+    "incoming_link": "Enlace entrante",
+    "query": "Consulta de Dataview",
 };

src/services/EditEngineService.ts

@@ -46,7 +46,7 @@ class EditEngine {
                 await inlineColumnEdit();
                 return;
             }
-            rowFields.frontmatter[columnId] = DataviewService.parseLiteral(newValue, InputType.MARKDOWN, ddbbConfig);
+            rowFields.frontmatter[columnId] = newValue;
             await persistFrontmatter();
             await inlineRemoveColumn();
         }

src/settings/handlers/source/SourceDropDownHandler.ts

@@ -1,11 +1,16 @@
 import { SourceDataTypes } from "helpers/Constants";
+import { t } from "lang/helpers";
 import { AbstractSettingsHandler, SettingHandlerResponse } from "settings/handlers/AbstractSettingHandler";
 import { add_dropdown } from "settings/SettingsComponents";
 
 export class SourceDropDownHandler extends AbstractSettingsHandler {
     settingTitle: string = 'Select the source of database data';
     handle(settingHandlerResponse: SettingHandlerResponse): SettingHandlerResponse {
         const { settingsManager, containerEl, view } = settingHandlerResponse;
+        const sourceOptions: Record<string, string> = {};
+        Object.entries(SourceDataTypes).forEach(([key, value]) => {
+            sourceOptions[value] = t(value);
+        });
         const source_dropdown_promise = async (value: string): Promise<void> => {
             // update settings
             view.diskConfig.updateConfig({ source_data: value });
@@ -18,13 +23,7 @@ export class SourceDropDownHandler extends AbstractSettingsHandler {
             this.settingTitle,
             'Select from which source you want to get the data to be displayed in the table.',
             view.diskConfig.yaml.config.source_data,
-            {
-                current_folder: SourceDataTypes.CURRENT_FOLDER,
-                tag: SourceDataTypes.TAG,
-                outgoing_link: SourceDataTypes.OUTGOING_LINK,
-                incoming_link: SourceDataTypes.INCOMING_LINK,
-                query: SourceDataTypes.QUERY,
-            },
+            sourceOptions,
             source_dropdown_promise
         );
         return this.goNext(settingHandlerResponse);