From 19461020efe5deb6b73781c2b8c36acdef913f2c Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sun, 19 Dec 2021 06:56:11 +0100
Subject: [PATCH] Various layout fixes.

---
 .github/mergify.yml                                    |  6 ++++++
 frontend/src/components/accounts/Show.vue              |  7 ++++++-
 frontend/src/components/transactions/Create.vue        |  2 +-
 frontend/src/components/transactions/Edit.vue          | 10 ++++++----
 frontend/src/components/transactions/SplitForm.vue     |  6 +++---
 frontend/src/components/transactions/SplitPills.vue    |  2 --
 .../src/components/transactions/TransactionAccount.vue |  4 +---
 .../src/components/transactions/TransactionAmount.vue  |  2 --
 .../src/components/transactions/TransactionDate.vue    | 10 ++++------
 .../components/transactions/TransactionDescription.vue |  5 +----
 .../components/transactions/TransactionListLarge.vue   |  7 +++++++
 11 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index ed89260108..782fc7c022 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -5,3 +5,9 @@ pull_request_rules:
     actions:
       merge:
         method: merge
+  - name: Close all on main
+    conditions:
+      - base=main
+    actions:
+      close:
+        message: Please do not open PR's on the `main` branch, but on the `develop` branch only. Thank you!
diff --git a/frontend/src/components/accounts/Show.vue b/frontend/src/components/accounts/Show.vue
index d7ff2eb0dc..835567534c 100644
--- a/frontend/src/components/accounts/Show.vue
+++ b/frontend/src/components/accounts/Show.vue
@@ -28,6 +28,7 @@
 
     <TransactionListLarge
         :entries="rawTransactions"
+        :isEmpty="isEmpty"
         :page="currentPage"
         ref="list"
         :total="total"
@@ -80,7 +81,8 @@ export default {
       perPage: 51,
       locale: 'en-US',
       api: null,
-      nameLoading: false
+      nameLoading: false,
+      isEmpty: false
     }
   },
   created() {
@@ -137,6 +139,9 @@ export default {
               .then(response => {
                       // console.log('Now getTransactions() DONE!');
                       this.total = parseInt(response.data.meta.pagination.total);
+                      if (0 === this.total) {
+                        this.isEmpty = true;
+                      }
                       // let transactions = response.data.data;
                       // console.log('Have downloaded ' + transactions.length + ' transactions');
                       // console.log(response.data);
diff --git a/frontend/src/components/transactions/Create.vue b/frontend/src/components/transactions/Create.vue
index 25fca03e49..7dfd65342f 100644
--- a/frontend/src/components/transactions/Create.vue
+++ b/frontend/src/components/transactions/Create.vue
@@ -448,7 +448,7 @@ export default {
       this.updateField(payload);
       if('description' === payload.field) {
         // jump to account
-        this.$refs.splitForms[payload.index].$refs.sourceAccount.giveFocus();
+        //this.$refs.splitForms[payload.index].$refs.sourceAccount.giveFocus();
       }
     },
     storeDate: function (payload) {
diff --git a/frontend/src/components/transactions/Edit.vue b/frontend/src/components/transactions/Edit.vue
index 949b101d00..77a670274b 100644
--- a/frontend/src/components/transactions/Edit.vue
+++ b/frontend/src/components/transactions/Edit.vue
@@ -239,7 +239,7 @@ export default {
     submittedAttachments: function () {
       this.finaliseSubmission();
     },
-    transactionType: function() {
+    transactionType: function () {
       this.getExpectedSourceTypes();
     }
   },
@@ -320,9 +320,11 @@ export default {
       result.source_account_name = array.source_name;
       result.source_account_type = array.source_type;
 
-      result.destination_account_id = array.destination_id;
-      result.destination_account_name = array.destination_name;
-      result.destination_account_type = array.destination_type;
+      if (array.destination_type !== 'Cash account') {
+        result.destination_account_id = array.destination_id;
+        result.destination_account_name = array.destination_name;
+        result.destination_account_type = array.destination_type;
+      }
 
       // amount:
       result.amount = array.amount;
diff --git a/frontend/src/components/transactions/SplitForm.vue b/frontend/src/components/transactions/SplitForm.vue
index 7ea30c6bbd..b4a4dca460 100644
--- a/frontend/src/components/transactions/SplitForm.vue
+++ b/frontend/src/components/transactions/SplitForm.vue
@@ -385,13 +385,13 @@ export default {
 
       this.$emit('remove-transaction', {index: this.index});
     },
-    triggerNextAccount: function(e) {
+    triggerNextAccount: function (e) {
       //alert(e);
-      if('source' === e) {
+      if ('source' === e) {
         // console.log('Jump to destination!');
         this.$refs.destinationAccount.giveFocus();
       }
-    }
+    },
   },
   computed: {
     splitDate: function () {
diff --git a/frontend/src/components/transactions/SplitPills.vue b/frontend/src/components/transactions/SplitPills.vue
index 64b622fc66..cf9f535bbf 100644
--- a/frontend/src/components/transactions/SplitPills.vue
+++ b/frontend/src/components/transactions/SplitPills.vue
@@ -20,8 +20,6 @@
 
 <template>
   <div>
-    <span>Length: {{ this.transactions.length }}</span>
-
     <div v-if="transactions.length > 1" class="row">
       <div class="col">
         <!-- tabs -->
diff --git a/frontend/src/components/transactions/TransactionAccount.vue b/frontend/src/components/transactions/TransactionAccount.vue
index 514e48751b..ff6fb8d969 100644
--- a/frontend/src/components/transactions/TransactionAccount.vue
+++ b/frontend/src/components/transactions/TransactionAccount.vue
@@ -118,9 +118,7 @@ export default {
   },
   mounted: function () {
     this.$nextTick(function () {
-      if (0 === this.index) {
         this.$refs.inputThing.$refs.input.tabIndex = 2;
-      }
     })
   },
   methods: {
@@ -128,7 +126,7 @@ export default {
       return './api/v1/autocomplete/accounts?types=' + types.join(',') + '&query=' + query;
     },
     giveFocus: function () {
-      //console.log('I want focus! now OK: ' + this.direction + ' l: ' + this.accounts.length);
+      // console.log('I want focus! now OK: ' + this.direction + ' l: ' + this.accounts.length);
       //console.log(this.$refs.inputThing.$refs.input.value);
       this.$refs.inputThing.$refs.input.focus();
       //console.log(this.$refs.inputThing.isFocused);
diff --git a/frontend/src/components/transactions/TransactionAmount.vue b/frontend/src/components/transactions/TransactionAmount.vue
index bd84a2de52..38737b6294 100644
--- a/frontend/src/components/transactions/TransactionAmount.vue
+++ b/frontend/src/components/transactions/TransactionAmount.vue
@@ -71,9 +71,7 @@ export default {
   },
   mounted: function () {
     this.$nextTick(function () {
-      if (0 === this.index) {
         this.$refs.input.tabIndex = 3;
-      }
     })
   },
   methods: {
diff --git a/frontend/src/components/transactions/TransactionDate.vue b/frontend/src/components/transactions/TransactionDate.vue
index e3621933b2..2ba05c0068 100644
--- a/frontend/src/components/transactions/TransactionDate.vue
+++ b/frontend/src/components/transactions/TransactionDate.vue
@@ -69,12 +69,10 @@ export default {
     this.timeStr = parts[1];
   },
   mounted: function () {
-    if (0 === this.index) {
-      this.$nextTick(function () {
-        this.$refs.date.tabIndex = 6;
-        this.$refs.time.tabIndex = 7;
-      });
-    }
+    this.$nextTick(function () {
+      this.$refs.date.tabIndex = 6;
+      this.$refs.time.tabIndex = 7;
+    });
   },
   data() {
     return {
diff --git a/frontend/src/components/transactions/TransactionDescription.vue b/frontend/src/components/transactions/TransactionDescription.vue
index 3b56b3a552..b68121d85d 100644
--- a/frontend/src/components/transactions/TransactionDescription.vue
+++ b/frontend/src/components/transactions/TransactionDescription.vue
@@ -67,10 +67,7 @@ export default {
         .then(response => {
           this.descriptions = response.data;
           this.initialSet = response.data;
-
-          if(0===this.index) {
-            this.$refs.autoComplete.$refs.input.tabIndex = 1;
-          }
+          this.$refs.autoComplete.$refs.input.tabIndex = 1;
 
         });
   },
diff --git a/frontend/src/components/transactions/TransactionListLarge.vue b/frontend/src/components/transactions/TransactionListLarge.vue
index 3b9ea4042e..cf17c04020 100644
--- a/frontend/src/components/transactions/TransactionListLarge.vue
+++ b/frontend/src/components/transactions/TransactionListLarge.vue
@@ -225,6 +225,9 @@ export default {
     entries: function (value) {
       // console.log('detected new transactions! (' + value.length + ')');
       this.parseTransactions();
+      if(this.isEmpty) {
+        this.loading=false;
+      }
     },
     // value: function (value) {
     //   // console.log('Watch value!');
@@ -406,6 +409,10 @@ export default {
       type: Boolean,
       default: true
     },
+    isEmpty: {
+      type: Boolean,
+      default: false
+    },
     total: {
       type: Number,
       default: 1