From 6c4cce5601777fe0c907078a4cf79673d4bf1d47 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Tue, 22 Dec 2020 00:44:34 +0800
Subject: [PATCH] code refactor

---
 src/components/mobile/ListItemSelectionSheet.vue  |  2 +-
 src/components/mobile/TreeViewSelectionSheet.vue  |  8 ++++----
 .../mobile/TwoColumnListItemSelectionSheet.vue    | 12 ++++++------
 src/filters/itemFieldContent.js                   | 13 +++++++++++++
 src/filters/itemFieldContentOrItem.js             | 15 ---------------
 src/mobile-main.js                                |  4 ++--
 6 files changed, 26 insertions(+), 28 deletions(-)
 create mode 100644 src/filters/itemFieldContent.js
 delete mode 100644 src/filters/itemFieldContentOrItem.js

diff --git a/src/components/mobile/ListItemSelectionSheet.vue b/src/components/mobile/ListItemSelectionSheet.vue
index 84c2f930..76813e7f 100644
--- a/src/components/mobile/ListItemSelectionSheet.vue
+++ b/src/components/mobile/ListItemSelectionSheet.vue
@@ -12,7 +12,7 @@
                               v-for="(item, index) in items"
                               :key="item | itemKeyValue(index, keyField, valueType)"
                               :value="item | itemKeyValue(index, valueField, valueType)"
-                              :title="item | itemFieldContentOrItem(titleField, titleI18n)"
+                              :title="item | itemFieldContent(titleField, item, titleI18n)"
                               @click="onItemClicked(item, index)">
                     <f7-icon slot="media"
                              :icon="item[iconField] | icon(iconType)"
diff --git a/src/components/mobile/TreeViewSelectionSheet.vue b/src/components/mobile/TreeViewSelectionSheet.vue
index 5b77687f..08979663 100644
--- a/src/components/mobile/TreeViewSelectionSheet.vue
+++ b/src/components/mobile/TreeViewSelectionSheet.vue
@@ -11,8 +11,8 @@
                 <f7-treeview-item v-for="item in items"
                                   item-toggle
                                   :opened="isPrimaryItemHasSecondaryValue(item)"
-                                  :key="item | itemFieldContentOrItem(primaryKeyField, false)"
-                                  :label="item | itemFieldContentOrItem(primaryTitleField, primaryTitleI18n)">
+                                  :key="item | itemFieldContent(primaryKeyField, item, false)"
+                                  :label="item | itemFieldContent(primaryTitleField, item, primaryTitleI18n)">
                     <f7-icon slot="media"
                              :icon="item[primaryIconField] | icon(primaryIconType)"
                              :style="item[primaryColorField] | iconStyle(primaryIconType, 'var(--default-icon-color)')"
@@ -21,8 +21,8 @@
                     <f7-treeview-item v-for="subItem in item[primarySubItemsField]"
                                       selectable
                                       :selected="isSecondarySelected(subItem)"
-                                      :key="subItem | itemFieldContentOrItem(secondaryKeyField, false)"
-                                      :label="subItem | itemFieldContentOrItem(secondaryTitleField, secondaryTitleI18n)"
+                                      :key="subItem | itemFieldContent(secondaryKeyField, subItem, false)"
+                                      :label="subItem | itemFieldContent(secondaryTitleField, subItem, secondaryTitleI18n)"
                                       @click="onSecondaryItemClicked(subItem)">
                         <f7-icon slot="media"
                                  :icon="subItem[secondaryIconField] | icon(secondaryIconType)"
diff --git a/src/components/mobile/TwoColumnListItemSelectionSheet.vue b/src/components/mobile/TwoColumnListItemSelectionSheet.vue
index fabd97a2..de6a50ff 100644
--- a/src/components/mobile/TwoColumnListItemSelectionSheet.vue
+++ b/src/components/mobile/TwoColumnListItemSelectionSheet.vue
@@ -13,9 +13,9 @@
                         <f7-list no-hairlines class="primary-list no-margin-top no-margin-bottom">
                             <f7-list-item link="#" no-chevron
                                           v-for="item in items"
-                                          :key="item | itemFieldContentOrItem(primaryKeyField, false)"
-                                          :value="item | itemFieldContentOrItem(primaryValueField, false)"
-                                          :title="item | itemFieldContentOrItem(primaryTitleField, primaryTitleI18n)"
+                                          :key="item | itemFieldContent(primaryKeyField, item, false)"
+                                          :value="item | itemFieldContent(primaryValueField, item, false)"
+                                          :title="item | itemFieldContent(primaryTitleField, null, primaryTitleI18n)"
                                           @click="onPrimaryItemClicked(item)">
                                 <f7-icon slot="media"
                                          :icon="item[primaryIconField] | icon(primaryIconType)"
@@ -31,9 +31,9 @@
                         <f7-list no-hairlines class="secondary-list no-margin-top no-margin-bottom" v-if="selectedPrimaryItem && primarySubItemsField && selectedPrimaryItem[primarySubItemsField]">
                             <f7-list-item link="#" no-chevron
                                           v-for="subItem in selectedPrimaryItem[primarySubItemsField]"
-                                          :key="subItem | itemFieldContentOrItem(secondaryKeyField, false)"
-                                          :value="subItem | itemFieldContentOrItem(secondaryValueField, false)"
-                                          :title="subItem | itemFieldContentOrItem(secondaryTitleField, secondaryTitleI18n)"
+                                          :key="subItem | itemFieldContent(secondaryKeyField, subItem, false)"
+                                          :value="subItem | itemFieldContent(secondaryValueField, subItem, false)"
+                                          :title="subItem | itemFieldContent(secondaryTitleField, null, secondaryTitleI18n)"
                                           @click="onSecondaryItemClicked(subItem)">
                                 <f7-icon slot="media"
                                          :icon="subItem[secondaryIconField] | icon(secondaryIconType)"
diff --git a/src/filters/itemFieldContent.js b/src/filters/itemFieldContent.js
new file mode 100644
index 00000000..f5a4adf9
--- /dev/null
+++ b/src/filters/itemFieldContent.js
@@ -0,0 +1,13 @@
+export default function ({i18n}, value, fieldName, defaultValue, translate) {
+    let content = defaultValue;
+
+    if (fieldName) {
+        content = value[fieldName];
+    }
+
+    if (translate && content) {
+        content = i18n.t(content);
+    }
+
+    return content;
+}
diff --git a/src/filters/itemFieldContentOrItem.js b/src/filters/itemFieldContentOrItem.js
deleted file mode 100644
index e50f7a00..00000000
--- a/src/filters/itemFieldContentOrItem.js
+++ /dev/null
@@ -1,15 +0,0 @@
-export default function ({i18n}, value, fieldName, translate) {
-    let content = '';
-
-    if (fieldName) {
-        content = value[fieldName];
-    } else {
-        content = value;
-    }
-
-    if (translate) {
-        content = i18n.t(content);
-    }
-
-    return content;
-}
diff --git a/src/mobile-main.js b/src/mobile-main.js
index 40ec072c..642eb63a 100644
--- a/src/mobile-main.js
+++ b/src/mobile-main.js
@@ -31,7 +31,7 @@ import userstate from './lib/userstate.js';
 import exchangeRates from './lib/exchangeRates.js';
 import webauthn from './lib/webauthn.js';
 import utils from './lib/utils.js';
-import itemFieldContentOrItemFilter from './filters/itemFieldContentOrItem.js';
+import itemFieldContentFilter from './filters/itemFieldContent.js';
 import currencyFilter from './filters/currency.js';
 import iconFilter from './filters/icon.js';
 import iconStyleFilter from './filters/iconStyle.js';
@@ -209,7 +209,7 @@ Vue.prototype.$services = services;
 Vue.prototype.$exchangeRates = exchangeRates;
 Vue.prototype.$user = userstate;
 
-Vue.filter('itemFieldContentOrItem', (value, fieldName, translate) => itemFieldContentOrItemFilter({ i18n }, value, fieldName, translate));
+Vue.filter('itemFieldContent', (value, fieldName, defaultValue, translate) => itemFieldContentFilter({ i18n }, value, fieldName, defaultValue, translate));
 Vue.filter('currency', (value, currencyCode) => currencyFilter({ i18n }, value, currencyCode));
 Vue.filter('icon', (value, iconType) => iconFilter(value, iconType));
 Vue.filter('iconStyle', (value, iconType, defaultColor) => iconStyleFilter(value, iconType, defaultColor));