From 57825f6449e0949e96c9a8aa48272dbcc03fc8c0 Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Thu, 4 Feb 2021 06:48:11 +0100
Subject: [PATCH] #1771 Fix sort of field selection listboxes on dashboard
 widget filter forms

---
 frontend/app/scripts/services/api/DashboardSrv.js               | 1 +
 frontend/app/views/directives/dashboard/filters.html            | 2 +-
 .../app/views/directives/dashboard/multiline/serie.filters.html | 2 +-
 frontend/app/views/directives/dashboard/serie.filters.html      | 2 +-
 frontend/app/views/directives/dashboard/text/serie.filters.html | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/app/scripts/services/api/DashboardSrv.js b/frontend/app/scripts/services/api/DashboardSrv.js
index 8acf253e95..ba5394b896 100644
--- a/frontend/app/scripts/services/api/DashboardSrv.js
+++ b/frontend/app/scripts/services/api/DashboardSrv.js
@@ -233,6 +233,7 @@
                         _.each(metadata.entities, function(entity) {
                             metadata[entity] = _.omit(data[entity], 'attributes');
                             metadata[entity].attributes = self._objectifyBy(data[entity].attributes, 'name');
+                            metadata[entity].attributeKeys = _.keys(metadata[entity].attributes).sort();
                         });
 
                         self.metadata[version] = metadata;
diff --git a/frontend/app/views/directives/dashboard/filters.html b/frontend/app/views/directives/dashboard/filters.html
index 8143f917d1..192d2f1041 100644
--- a/frontend/app/views/directives/dashboard/filters.html
+++ b/frontend/app/views/directives/dashboard/filters.html
@@ -10,7 +10,7 @@
                 </button>
             </span>
             <select class="form-control" ng-model="filter.field"
-                ng-options="item.name as item.name for (key, item) in metadata[component.options.entity].attributes"
+                ng-options="item for item in metadata[component.options.entity].attributeKeys"
                 ng-change="setFilterField(filter, component.options.entity)"></select>
         </div>
     </div>
diff --git a/frontend/app/views/directives/dashboard/multiline/serie.filters.html b/frontend/app/views/directives/dashboard/multiline/serie.filters.html
index 60c98c79ba..7851464da7 100644
--- a/frontend/app/views/directives/dashboard/multiline/serie.filters.html
+++ b/frontend/app/views/directives/dashboard/multiline/serie.filters.html
@@ -10,7 +10,7 @@
                 </button>
             </span>
             <select class="form-control" ng-model="filter.field"
-                ng-options="item.name as item.name for (key, item) in metadata[serie.entity].attributes"
+                ng-options="item for item in metadata[serie.entity].attributeKeys"
                 ng-change="setFilterField(filter, serie.entity)"></select>
         </div>
     </div>
diff --git a/frontend/app/views/directives/dashboard/serie.filters.html b/frontend/app/views/directives/dashboard/serie.filters.html
index 1026953b8c..b9e8f5ff80 100644
--- a/frontend/app/views/directives/dashboard/serie.filters.html
+++ b/frontend/app/views/directives/dashboard/serie.filters.html
@@ -10,7 +10,7 @@
                 </button>
             </span>
             <select class="form-control" ng-model="filter.field"
-                ng-options="item.name as item.name for (key, item) in metadata[component.options.entity].attributes"
+                ng-options="item for item in metadata[component.options.entity].attributeKeys"
                 ng-change="setFilterField(filter, component.options.entity)"></select>
         </div>
     </div>
diff --git a/frontend/app/views/directives/dashboard/text/serie.filters.html b/frontend/app/views/directives/dashboard/text/serie.filters.html
index ff38f8c3b6..817c11ee34 100644
--- a/frontend/app/views/directives/dashboard/text/serie.filters.html
+++ b/frontend/app/views/directives/dashboard/text/serie.filters.html
@@ -10,7 +10,7 @@
                 </button>
             </span>
             <select class="form-control" ng-model="filter.field"
-                ng-options="item.name as item.name for (key, item) in metadata[serie.entity].attributes"
+                ng-options="item for item in metadata[serie.entity].attributeKeys"
                 ng-change="setFilterField(filter, serie.entity)"></select>
         </div>
     </div>