feat: sort label column filters (NUWCDIVNPT#1334)

cd-rite · Jul 29, 2024 · 66abb10 · 66abb10
1 parent 46d165d
commit 66abb10
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 1 deletion.
diff --git a/client/src/js/SM/AssetSelection.js b/client/src/js/SM/AssetSelection.js
@@ -39,6 +39,9 @@ SM.AssetSelection.GridPanel = Ext.extend(Ext.grid.GridPanel, {
         filter: {
           type: 'values',
           collectionId: this.collectionId,
+          comparer: function (a, b) {
+            return SM.ColumnFilters.CompareFns.labelIds(a, b, _this.collectionId)
+            },          
           renderer: SM.ColumnFilters.Renderers.labels
         },
         renderer: function (value) {

diff --git a/client/src/js/SM/CollectionAsset.js b/client/src/js/SM/CollectionAsset.js
@@ -146,6 +146,9 @@ SM.CollectionAssetGrid = Ext.extend(Ext.grid.GridPanel, {
                 filter: {
                     type: 'values', 
                     collectionId: me.collectionId,
+                    comparer: function (a, b) {
+                        return SM.ColumnFilters.CompareFns.labelIds(a, b, me.collectionId)
+                        },                    
                     renderer: SM.ColumnFilters.Renderers.labels
                 },
                 renderer: function (value, metadata) {

diff --git a/client/src/js/SM/CollectionPanel.js b/client/src/js/SM/CollectionPanel.js
@@ -263,6 +263,9 @@ SM.CollectionPanel.AggGrid = Ext.extend(Ext.grid.GridPanel, {
             filter: {
               type: 'values',
               collectionId: _this.collectionId,
+              comparer: function (a, b) {
+                return SM.ColumnFilters.CompareFns.labelIds(a, b, _this.collectionId)
+                },
               renderer: SM.ColumnFilters.Renderers.labels
             },
             renderer: function (value, metadata) {
@@ -338,6 +341,9 @@ SM.CollectionPanel.AggGrid = Ext.extend(Ext.grid.GridPanel, {
             filter: {
               type: 'values',
               collectionId: _this.collectionId,
+              comparer: function (a, b) {
+                return SM.ColumnFilters.CompareFns.labelIds(a, b, _this.collectionId)
+                },              
               renderer: SM.ColumnFilters.Renderers.labels
             },
             renderer: function (value, metadata) {
@@ -570,6 +576,9 @@ SM.CollectionPanel.UnaggGrid = Ext.extend(Ext.grid.GridPanel, {
             filter: {
               type: 'values',
               collectionId: _this.collectionId,
+              comparer: function (a, b) {
+                return SM.ColumnFilters.CompareFns.labelIds(a, b, _this.collectionId)
+                },              
               renderer: SM.ColumnFilters.Renderers.labels
             },
             renderer: function (value, metadata) {

diff --git a/client/src/js/SM/ColumnFilters.js b/client/src/js/SM/ColumnFilters.js
@@ -350,7 +350,12 @@ SM.ColumnFilters.CompareFns = {
   },
   labels: (a, b) => {
 
-  }
+  },
+  labelIds: (a, b, collectionId) => {
+    if (a === "") return -1;
+    if (b === "") return 1;
+    return SM.Cache.getCollectionLabel(collectionId, a).name.localeCompare(SM.Cache.getCollectionLabel(collectionId, b).name)
+  },        
 }
 
 SM.ColumnFilters.Renderers = {

diff --git a/client/src/js/SM/FindingsPanel.js b/client/src/js/SM/FindingsPanel.js
@@ -477,6 +477,9 @@ SM.FindingsChildGrid = Ext.extend(Ext.grid.GridPanel, {
 				filter: {
 					type: 'values',
 					collectionId: me.panel.collectionId,
+					comparer: function (a, b) {
+						return SM.ColumnFilters.CompareFns.labelIds(a, b, me.panel.collectionId)
+						},      					
 					renderer: SM.ColumnFilters.Renderers.labels
 				},
 				renderer: function (value, metadata) {

diff --git a/client/src/js/collectionReview.js b/client/src/js/collectionReview.js
@@ -937,6 +937,9 @@ async function addCollectionReview ( params ) {
 					filter: {
 							type: 'values', 
 							collectionId: apiCollection.collectionId,
+							comparer: function (a, b) {
+								return SM.ColumnFilters.CompareFns.labelIds(a, b, apiCollection.collectionId)
+								},  
 							renderer: SM.ColumnFilters.Renderers.labels
 					},
 					renderer: function (value, metadata) {