#1771 Fix sort of field selection listboxes on dashboard widget filte…

…r forms
TheHive-Project · Feb 4, 2021 · 57825f6 · 57825f6
1 parent 8c096ef
commit 57825f6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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>