From 76c2db160ce6f0868f46a8de2882aaaf055a9d09 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Thu, 22 Jun 2023 11:45:29 -0400
Subject: [PATCH] Sort filter fields by visible columns in index views
 (CFM-295)

---
 app/templates/Standard/index.php |  9 ++++++++-
 app/templates/element/filter.php | 10 +++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php
index ab58c950b..5408b0e6e 100644
--- a/app/templates/Standard/index.php
+++ b/app/templates/Standard/index.php
@@ -153,7 +153,14 @@
   
 <!-- Search block -->
 <?php if(isset($vv_searchable_attributes)): ?>
-  <?= $this->element('filter'); ?>
+  <?php 
+    $filterArgs = array();
+    if(!empty($indexColumns)) {
+      // The keys of the $indexColumns are passed to the filters for sorting
+      $filterArgs['columnKeys'] = array_keys($indexColumns);  
+    }
+  ?>
+  <?= $this->element('filter', $filterArgs); ?>
 <?php endif; ?>
 
 <!-- Index table -->
diff --git a/app/templates/element/filter.php b/app/templates/element/filter.php
index df99f2bd2..88aedc239 100644
--- a/app/templates/element/filter.php
+++ b/app/templates/element/filter.php
@@ -138,7 +138,15 @@
       <?php
         $field_booleans_columns = [];
         $field_datetime_columns = [];
-
+        
+        if(!empty($columnKeys)) {
+          // To make our filters consistently ordered with the index columns, sort the $vv_searchable_attributes
+          // by the columns.inc $indexColumns keys (passed in to this View element as "$columnKeys"). The fields found
+          // in columns.inc will be placed first in the resulting array. Throw out any fields from $columnKeys that didn't
+          // exist in the original $vv_searchable_attributes array.
+          $vv_searchable_attributes = array_intersect_key(array_replace(array_flip($columnKeys), $vv_searchable_attributes), $vv_searchable_attributes);
+        }
+        
         foreach($vv_searchable_attributes as $key => $options) {
           if($options['type'] == 'boolean') {
             $field_booleans_columns[$key] = $options;