fix(ui): Link fieldtype, show display field

- make address a manually named entry type
- make a few more entry types searchable
- fix dropdown filter undefined issue
- reset settings docs if not saved
- fix ux dropdown toggle on click

models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts

@@ -41,12 +41,12 @@ export class AccountingLedgerEntry extends Doc {
   static getListViewSettings(): ListViewSettings {
     return {
       columns: [
+        'date',
         'account',
         'party',
         'debit',
         'credit',
         'referenceName',
-        'reverted',
       ],
     };
   }

models/baseModels/Address/Address.ts

@@ -1,6 +1,11 @@
-import { t } from 'fyo';
+import { Fyo, t } from 'fyo';
 import { Doc } from 'fyo/model/doc';
-import { EmptyMessageMap, FormulaMap, ListsMap } from 'fyo/model/types';
+import {
+  EmptyMessageMap,
+  FormulaMap,
+  ListsMap,
+  ListViewSettings,
+} from 'fyo/model/types';
 import { codeStateMap } from 'regional/in';
 import { getCountryInfo } from 'utils/misc';
 
@@ -54,4 +59,10 @@ export class Address extends Doc {
       return t`Enter Country to load States`;
     },
   };
+
+  static override getListViewSettings(): ListViewSettings {
+    return {
+      columns: ['name', 'addressLine1', 'city', 'state', 'country'],
+    };
+  }
 }

models/inventory/StockLedgerEntry.ts

@@ -1,7 +1,7 @@
 import { Doc } from 'fyo/model/doc';
+import { ListViewSettings } from 'fyo/model/types';
 import { Money } from 'pesa';
 
-
 export class StockLedgerEntry extends Doc {
   date?: Date;
   item?: string;
@@ -11,4 +11,17 @@ export class StockLedgerEntry extends Doc {
   referenceName?: string;
   referenceType?: string;
   batch?: string;
+
+  static override getListViewSettings(): ListViewSettings {
+    return {
+      columns: [
+        'date',
+        'item',
+        'location',
+        'rate',
+        'quantity',
+        'referenceName',
+      ],
+    };
+  }
 }

schemas/app/Address.json

@@ -1,8 +1,15 @@
 {
   "name": "Address",
   "label": "Address",
+  "naming": "manual",
   "isSingle": false,
   "fields": [
+    {
+      "fieldname": "name",
+      "label": "Address Name",
+      "fieldtype": "Data",
+      "required": true
+    },
     {
       "fieldname": "addressLine1",
       "label": "Address Line 1",
@@ -69,6 +76,7 @@
     }
   ],
   "quickEditFields": [
+    "name",
     "addressLine1",
     "addressLine2",
     "city",

schemas/app/PrintSettings.json

@@ -35,6 +35,7 @@
       "fieldtype": "Link",
       "target": "Address",
       "inline": true,
+      "create": true,
       "section": "Contacts"
     },
     {

schemas/regional/in/Address.json

@@ -9,6 +9,7 @@
     }
   ],
   "quickEditFields": [
+    "name",
     "addressLine1",
     "addressLine2",
     "city",

src/components/Controls/AutoComplete.vue

@@ -25,6 +25,7 @@
           :placeholder="inputPlaceholder"
           :readonly="isReadOnly"
           @focus="(e) => !isReadOnly && onFocus(e, toggleDropdown)"
+          @click="(e) => !isReadOnly && onFocus(e, toggleDropdown)"
           @blur="(e) => !isReadOnly && onBlur(e.target.value)"
           @input="onInput"
           @keydown.up="highlightItemUp"
@@ -55,7 +56,6 @@
     </template>
   </Dropdown>
 </template>
-
 <script>
 import { getOptionList } from 'fyo/utils';
 import Dropdown from 'src/components/Dropdown.vue';
@@ -81,7 +81,7 @@ export default {
     value: {
       immediate: true,
       handler(newValue) {
-        this.linkValue = this.getLinkValue(newValue);
+        this.setLinkValue(this.getLinkValue(newValue));
       },
     },
   },
@@ -89,7 +89,8 @@ export default {
     doc: { default: null },
   },
   mounted() {
-    this.linkValue = this.getLinkValue(this.linkValue || this.value);
+    const value = this.linkValue || this.value;
+    this.setLinkValue(this.getLinkValue(value));
   },
   computed: {
     options() {
@@ -101,6 +102,9 @@ export default {
     },
   },
   methods: {
+    setLinkValue(value) {
+      this.linkValue = value;
+    },
     getLinkValue(value) {
       const oldValue = this.linkValue;
       let option = this.options.find((o) => o.value === value);
@@ -116,7 +120,7 @@ export default {
     },
     async updateSuggestions(keyword) {
       if (typeof keyword === 'string') {
-        this.linkValue = keyword;
+        this.setLinkValue(keyword, true);
       }
 
       this.isLoading = true;
@@ -152,12 +156,12 @@ export default {
     },
     setSuggestion(suggestion) {
       if (suggestion?.actionOnly) {
-        this.linkValue = this.value;
+        this.setLinkValue(this.value);
         return;
       }
 
       if (suggestion) {
-        this.linkValue = suggestion.label;
+        this.setLinkValue(suggestion.label);
         this.triggerChange(suggestion.value);
       }
 

src/components/Controls/Link.vue

@@ -16,18 +16,42 @@ export default {
   },
   mounted() {
     if (this.value) {
-      this.linkValue = this.value;
+      this.setLinkValue();
     }
   },
   watch: {
     value: {
       immediate: true,
       handler(newValue) {
-        this.linkValue = newValue;
+        this.setLinkValue(newValue);
       },
     },
   },
   methods: {
+    async setLinkValue(newValue, isInput) {
+      if (isInput) {
+        return (this.linkValue = newValue || '');
+      }
+
+      const value = newValue ?? this.value;
+      const { fieldname, target } = this.df ?? {};
+      const displayField = fyo.schemaMap[target ?? '']?.inlineEditDisplayField;
+
+      if (!displayField) {
+        return (this.linkValue = value);
+      }
+
+      let displayValue = this.docs?.links?.[fieldname]?.get(displayField);
+      if (!displayValue) {
+        displayValue = await fyo.getValue(
+          target,
+          this.value ?? '',
+          displayField
+        );
+      }
+
+      this.linkValue = displayValue;
+    },
     getTargetSchemaName() {
       return this.df.target;
     },
@@ -104,10 +128,11 @@ export default {
             '<Badge color="blue" class="ms-2" v-if="isNewValue">{{ linkValue }}</Badge>' +
             '</div>',
           computed: {
+            value: () => this.value,
             linkValue: () => this.linkValue,
             isNewValue: () => {
               let values = this.suggestions.map((d) => d.value);
-              return this.linkValue && !values.includes(this.linkValue);
+              return this.value && !values.includes(this.value);
             },
           },
           components: { Badge },
@@ -134,6 +159,7 @@ export default {
         this.$emit('new-doc', doc);
         this.$router.back();
         this.results = [];
+        this.triggerChange(doc.name);
       });
     },
     async getCreateFilters() {

src/components/FilterDropdown.vue

@@ -165,7 +165,11 @@ export default {
   methods: {
     getRandomString,
     addNewFilter() {
-      let df = this.fields[0];
+      const df = this.fields[0];
+      if (!df) {
+        return;
+      }
+
       this.addFilter(df.fieldname, 'like', '', false);
     },
     addFilter(fieldname, condition, value, implicit) {

src/pages/Settings/Settings.vue

@@ -12,12 +12,11 @@
         class="sticky top-0 bg-white border-b"
       >
       </FormHeader>
-      <!-- Section Container -->
 
+      <!-- Section Container -->
       <div class="overflow-auto custom-scroll" v-if="doc">
         <CommonFormSection
           v-for="([name, fields], idx) in activeGroup.entries()"
-          @editrow="(doc: Doc) => toggleQuickEditDoc(doc)"
           :key="name + idx"
           ref="section"
           class="p-4"
@@ -95,13 +94,11 @@ export default defineComponent({
       canSave: false,
       activeTab: ModelNameEnum.AccountingSettings,
       groupedFields: null,
-      quickEditDoc: null,
     } as {
       errors: Record<string, string>;
       canSave: boolean;
       activeTab: string;
       groupedFields: null | UIGroupedFields;
-      quickEditDoc: null | Doc;
     };
   },
   provide() {
@@ -118,10 +115,26 @@ export default defineComponent({
   activated(): void {
     docsPathRef.value = docsPathMap.Settings ?? '';
   },
-  deactivated(): void {
+  async deactivated(): Promise<void> {
     docsPathRef.value = '';
+
+    if (!this.canSave) {
+      return;
+    }
+    await this.reset();
   },
   methods: {
+    async reset() {
+      const resetableDocs = this.schemas
+        .map(({ name }) => this.fyo.singles[name])
+        .filter((doc) => doc?.dirty) as Doc[];
+
+      for (const doc of resetableDocs) {
+        await doc.load();
+      }
+
+      this.update();
+    },
     async sync(): Promise<void> {
       const syncableDocs = this.schemas
         .map(({ name }) => this.fyo.singles[name])
@@ -151,14 +164,6 @@ export default defineComponent({
         await handleErrorWithDialog(err, doc);
       }
     },
-    async toggleQuickEditDoc(doc: Doc | null): Promise<void> {
-      if (this.quickEditDoc && doc) {
-        this.quickEditDoc = null;
-        await nextTick();
-      }
-
-      this.quickEditDoc = doc;
-    },
     async onValueChange(field: Field, value: DocValue): Promise<void> {
       const { fieldname } = field;
       delete this.errors[fieldname];

src/utils/search.ts

@@ -223,6 +223,10 @@ function getListViewList(fyo: Fyo): SearchItem[] {
     ModelNameEnum.PurchaseInvoice,
     ModelNameEnum.SalesInvoice,
     ModelNameEnum.Tax,
+    ModelNameEnum.UOM,
+    ModelNameEnum.Address,
+    ModelNameEnum.AccountingLedgerEntry,
+    ModelNameEnum.Currency,
   ];
 
   const hasInventory = fyo.doc.singles.AccountingSettings?.enableInventory;
@@ -231,7 +235,8 @@ function getListViewList(fyo: Fyo): SearchItem[] {
       ModelNameEnum.StockMovement,
       ModelNameEnum.Shipment,
       ModelNameEnum.PurchaseReceipt,
-      ModelNameEnum.Location
+      ModelNameEnum.Location,
+      ModelNameEnum.StockLedgerEntry
     );
   }