From 70cff267197860b8140a2c85a42b224b52394968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Sat, 11 Aug 2018 11:14:52 +0200
Subject: [PATCH] fix col order reset button, show only if order is changed

---
 app/Http/Controllers/TableEditController.php    | 2 ++
 resources/assets/js/components/ColumnEditor.vue | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/TableEditController.php b/app/Http/Controllers/TableEditController.php
index f3d4b10..00e99a9 100644
--- a/app/Http/Controllers/TableEditController.php
+++ b/app/Http/Controllers/TableEditController.php
@@ -262,6 +262,7 @@ class TableEditController extends Controller
 
                 case 'col.sort':
                     $changeset->setColOrder($input->order);
+                    $resp = !empty($changeset->columnOrder); // return flag if order is changed
                     break;
 
                 case 'note.set':
@@ -270,6 +271,7 @@ class TableEditController extends Controller
 
                 case 'reset.col-order': // called via POST or GET
                     $changeset->resetColumnOrder();
+                    $resp = $changeset->fetchAndTransformColumns(); // return all columns
                     break;
 
                 case 'reset.col-remove': // called via GET
diff --git a/resources/assets/js/components/ColumnEditor.vue b/resources/assets/js/components/ColumnEditor.vue
index 32d7311..60f5ad6 100644
--- a/resources/assets/js/components/ColumnEditor.vue
+++ b/resources/assets/js/components/ColumnEditor.vue
@@ -20,7 +20,7 @@ Complex animated column editor for the table edit page
             <th :style="tdWidthStyle('type')">Type</th>
             <th :style="tdWidthStyle('title')">Title</th>
             <th>
-              <a href="" type="button" v-if="!newTable"
+              <a href="" type="button" v-if="!newTable && orderChanged"
                  @click.prevent="resetOrder()"
                  class="text-danger no-decoration">
                 Reset Order
@@ -205,10 +205,12 @@ export default {
     newTable:   { type: Boolean, default: false },
     name:       { type: String,  required: true },
     xColumns:   { type: Array,   required: true },
+    orderChanged: { type: Boolean, default: false },
   },
   data () {
     return {
       newColNum: 0,
+      orderChanged: this.orderChanged,
       columns: this.xColumns,
       colTypes: ['string', 'int', 'float', 'bool'],
       debouncedSortUpdate: _.debounce(() => this.submitColOrder(), 350)
@@ -225,6 +227,8 @@ export default {
       this.query ({
         action: 'col.sort',
         order: ids,
+      }, (resp) => {
+        this.orderChanged = resp.data;
       })
     },
 
@@ -417,7 +421,8 @@ export default {
       this.query({
         action: 'reset.col-order'
       }, (resp) => {
-        this.columns = resp.data;
+        this.columns = resp.data
+        this.orderChanged = false
       })
     }
   }