Restore column filters when unpinning (#4473)

Fixes column filters when unpinning

seed/static/seed/js/controllers/inventory_list_controller.js

@@ -11,6 +11,7 @@ angular.module('BE.seed.controller.inventory_list', []).controller('inventory_li
   '$state',
   '$stateParams',
   '$q',
+  '$timeout',
   'inventory_service',
   'label_service',
   'data_quality_service',
@@ -45,6 +46,7 @@ angular.module('BE.seed.controller.inventory_list', []).controller('inventory_li
     $state,
     $stateParams,
     $q,
+    $timeout,
     inventory_service,
     label_service,
     data_quality_service,
@@ -1829,7 +1831,7 @@ angular.module('BE.seed.controller.inventory_list', []).controller('inventory_li
       fastWatch: true,
       flatEntityAccess: true,
       gridMenuShowHideColumns: false,
-      showTreeExpandNoChildren: false,
+      hidePinRight: true,
       saveFocus: false,
       saveGrouping: false,
       saveGroupingExpandedStates: false,
@@ -1840,6 +1842,7 @@ angular.module('BE.seed.controller.inventory_list', []).controller('inventory_li
       saveTreeView: false,
       saveVisible: false,
       saveWidths: false,
+      showTreeExpandNoChildren: false,
       useExternalFiltering: true,
       useExternalSorting: true,
       columnDefs: $scope.columns,
@@ -1903,7 +1906,24 @@ angular.module('BE.seed.controller.inventory_list', []).controller('inventory_li
             }
           }, 1000)
         );
-        gridApi.pinning.on.columnPinned($scope, saveSettings);
+        gridApi.pinning.on.columnPinned($scope, (colDef, container) => {
+          if (container) {
+            saveSettings();
+          } else {
+            // Hack to fix disappearing filter after unpinning a column
+            const gridCol = gridApi.grid.columns.find(({ colDef: { name } }) => name === colDef.name);
+            if (gridCol) {
+              gridCol.colDef.visible = false;
+              gridApi.grid.refresh();
+
+              $timeout(() => {
+                gridCol.colDef.visible = true;
+                gridApi.grid.refresh();
+                saveSettings();
+              }, 0);
+            }
+          }
+        });
 
         const selectionChanged = () => {
           const selected = gridApi.selection.getSelectedRows();

vendors/package.json

@@ -20,7 +20,7 @@
     "angular-translate-interpolation-messageformat": "^2.19.0",
     "angular-translate-loader-static-files": "^2.19.0",
     "angular-ui-bootstrap": "^2.5.6",
-    "angular-ui-grid": "^4.12.2",
+    "angular-ui-grid": "^4.12.4",
     "angular-ui-notification": "^0.3.6",
     "angular-ui-router": "^1.0.30",
     "angular-ui-router.statehelper": "^1.3.1",