code refactor

mayswind · Feb 4, 2025 · 00d6f5d · 00d6f5d
1 parent 3c36378
commit 00d6f5d
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 87 deletions.
diff --git a/src/views/mobile/accounts/ListPage.vue b/src/views/mobile/accounts/ListPage.vue
@@ -363,32 +363,6 @@ function setSortable(): void {
     displayOrderModified.value = false;
 }
 
-function onSort(event: { el: { id: string }; from: number; to: number }): void {
-    if (!event || !event.el || !event.el.id) {
-        showToast('Unable to move account');
-        return;
-    }
-
-    const id = parseAccountIdFromDomId(event.el.id);
-
-    if (!id) {
-        showToast('Unable to move account');
-        return;
-    }
-
-    accountsStore.changeAccountDisplayOrder({
-        accountId: id,
-        from: event.from - 1, // first item in the list is title, so the index need minus one
-        to: event.to - 1,
-        updateListOrder: true,
-        updateGlobalListOrder: true
-    }).then(() => {
-        displayOrderModified.value = true;
-    }).catch(error => {
-        showToast(error.message || error);
-    });
-}
-
 function saveSortResult(): void {
     if (!displayOrderModified.value) {
         showHidden.value = false;
@@ -416,6 +390,32 @@ function saveSortResult(): void {
     });
 }
 
+function onSort(event: { el: { id: string }; from: number; to: number }): void {
+    if (!event || !event.el || !event.el.id) {
+        showToast('Unable to move account');
+        return;
+    }
+
+    const id = parseAccountIdFromDomId(event.el.id);
+
+    if (!id) {
+        showToast('Unable to move account');
+        return;
+    }
+
+    accountsStore.changeAccountDisplayOrder({
+        accountId: id,
+        from: event.from - 1, // first item in the list is title, so the index need minus one
+        to: event.to - 1,
+        updateListOrder: true,
+        updateGlobalListOrder: true
+    }).then(() => {
+        displayOrderModified.value = true;
+    }).catch(error => {
+        showToast(error.message || error);
+    });
+}
+
 function onPageAfterIn(): void {
     if (accountsStore.accountListStateInvalid && !loading.value) {
         reload(null);

diff --git a/src/views/mobile/categories/ListPage.vue b/src/views/mobile/categories/ListPage.vue
@@ -347,14 +347,6 @@ function saveSortResult(): void {
     });
 }
 
-function onPageAfterIn(): void {
-    if (transactionCategoriesStore.transactionCategoryListStateInvalid && !loading.value) {
-        reload(null);
-    }
-
-    routeBackOnError(props.f7router, loadingError);
-}
-
 function onSort(event: { el: { id: string }; from: number; to: number }): void {
     if (!event || !event.el || !event.el.id) {
         showToast('Unable to move category');
@@ -379,6 +371,14 @@ function onSort(event: { el: { id: string }; from: number; to: number }): void {
     });
 }
 
+function onPageAfterIn(): void {
+    if (transactionCategoriesStore.transactionCategoryListStateInvalid && !loading.value) {
+        reload(null);
+    }
+
+    routeBackOnError(props.f7router, loadingError);
+}
+
 init();
 </script>
 

diff --git a/src/views/mobile/tags/ListPage.vue b/src/views/mobile/tags/ListPage.vue
@@ -165,7 +165,7 @@ const props = defineProps<{
 }>();
 
 const { tt } = useI18n();
-const { showToast, routeBackOnError } = useI18nUIComponents();
+const { showAlert, showToast, routeBackOnError } = useI18nUIComponents();
 
 const transactionTagsStore = useTransactionTagsStore();
 
@@ -207,7 +207,24 @@ function parseTagIdFromDomId(domId: string): string | null {
     return domId.substring(4); // tag_
 }
 
-function reload(done?: () => void): void {
+function init(): void {
+    loading.value = true;
+
+    transactionTagsStore.loadAllTags({
+        force: false
+    }).then(() => {
+        loading.value = false;
+    }).catch(error => {
+        if (error.processed) {
+            loading.value = false;
+        } else {
+            loadingError.value = error;
+            showToast(error.message || error);
+        }
+    });
+}
+
+function reload(done: (() => void) | null): void {
     if (sortable.value || hasEditingTag.value) {
         done?.();
         return;
@@ -273,43 +290,6 @@ function cancelSave(tag: TransactionTag): void {
     }
 }
 
-function setSortable(): void {
-    if (sortable.value || hasEditingTag.value) {
-        return;
-    }
-
-    showHidden.value = true;
-    sortable.value = true;
-    displayOrderModified.value = false;
-}
-
-function saveSortResult(): void {
-    if (!displayOrderModified.value) {
-        showHidden.value = false;
-        sortable.value = false;
-        return;
-    }
-
-    displayOrderSaving.value = true;
-    showLoading();
-
-    transactionTagsStore.updateTagDisplayOrders().then(() => {
-        displayOrderSaving.value = false;
-        hideLoading();
-
-        showHidden.value = false;
-        sortable.value = false;
-        displayOrderModified.value = false;
-    }).catch(error => {
-        displayOrderSaving.value = false;
-        hideLoading();
-
-        if (!error.processed) {
-            showToast(error.message || error);
-        }
-    });
-}
-
 function hide(tag: TransactionTag, hidden: boolean): void {
     showLoading();
 
@@ -329,7 +309,7 @@ function hide(tag: TransactionTag, hidden: boolean): void {
 
 function remove(tag: TransactionTag | null, confirm: boolean): void {
     if (!tag) {
-        showToast('An error occurred');
+        showAlert('An error occurred');
         return;
     }
 
@@ -359,8 +339,41 @@ function remove(tag: TransactionTag | null, confirm: boolean): void {
     });
 }
 
-function onPageAfterIn(): void {
-    routeBackOnError(props.f7router, loadingError);
+function setSortable(): void {
+    if (sortable.value || hasEditingTag.value) {
+        return;
+    }
+
+    showHidden.value = true;
+    sortable.value = true;
+    displayOrderModified.value = false;
+}
+
+function saveSortResult(): void {
+    if (!displayOrderModified.value) {
+        showHidden.value = false;
+        sortable.value = false;
+        return;
+    }
+
+    displayOrderSaving.value = true;
+    showLoading();
+
+    transactionTagsStore.updateTagDisplayOrders().then(() => {
+        displayOrderSaving.value = false;
+        hideLoading();
+
+        showHidden.value = false;
+        sortable.value = false;
+        displayOrderModified.value = false;
+    }).catch(error => {
+        displayOrderSaving.value = false;
+        hideLoading();
+
+        if (!error.processed) {
+            showToast(error.message || error);
+        }
+    });
 }
 
 function onSort(event: { el: { id: string }, from: number, to: number }): void {
@@ -387,18 +400,15 @@ function onSort(event: { el: { id: string }, from: number, to: number }): void {
     });
 }
 
-transactionTagsStore.loadAllTags({
-    force: false
-}).then(() => {
-    loading.value = false;
-}).catch(error => {
-    if (error.processed) {
-        loading.value = false;
-    } else {
-        loadingError.value = error;
-        showToast(error.message || error);
+function onPageAfterIn(): void {
+    if (transactionTagsStore.transactionTagListStateInvalid && !loading.value) {
+        reload(null);
     }
-});
+
+    routeBackOnError(props.f7router, loadingError);
+}
+
+init();
 </script>
 
 <style>