ROU-12515: Saved View filters don't show in UI since version 2.21.0 (#484)

* fix(layout, filter): fix issue with filter not being visually applied when usign SetViewLayout

* fix(view): fix issue column not visible when using setViewLayout

* chore(): update version to 2.21.2

Author: OS-giulianasilva

gulp/DefaultSpecs.js

@@ -19,7 +19,7 @@ const constants = {
 
 // Store the default project specifications
 const specs = {
-	version: '2.21.1',
+	version: '2.21.2',
 	name: 'OutSystems DataGrid',
 	description: '',
 	url: 'Website:\n • ' + constants.websiteUrl,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "outsystems-datagrid",
-  "version": "2.21.1",
+  "version": "2.21.2",
   "description": "OutSystems Data Grid for Reactive Web",
   "author": "UI Components Team",
   "license": "BSD-3-Clause",

src/OSFramework/DataGrid/Constants.ts

@@ -1,7 +1,7 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 namespace OSFramework.DataGrid.Constants {
 	/* OutSystems Data Grid Version */
-	export const OSDataGridVersion = '2.21.1';
+	export const OSDataGridVersion = '2.21.2';
 	/* OutSystems null values */
 	export const OSNullDate = '1900-01-01';
 	export const OSNullDateTime = '1900-01-01T00:00:00';

src/Providers/DataGrid/Wijmo/Features/View.ts

@@ -94,19 +94,16 @@ namespace Providers.DataGrid.Wijmo.Feature {
 		 */
 		private _setGroups(columns, config) {
 			for (let i = 0; i < config.length; i++) {
-				let colDef = columns.filter((x) => x.header === config[i].header);
+				const colDef = columns.filter((x) => x.header === config[i].header);
 				if (colDef.length > 0) {
-					colDef = colDef[0];
+					const colToUpdate = colDef[0];
 					if (config[i].children && config[i].children.length > 0) {
-						this._setGroups(colDef.columns, config[i].children[0]);
+						this._setGroups(colToUpdate.columns, config[i].children[0]);
 					}
-					columns.remove(colDef);
 					// due to Wijmo's breaking change, in case it is not defined, we need to assign an empty string to collapseTo property
-					colDef.collapseTo = config[i].collapseTo ?? '';
-					colDef.isCollapsed = config[i].isCollapsed || false; // in case it wasn't defined, set to false
-					colDef.align = config[i].align || colDef.align;
-
-					columns.insert(i, colDef);
+					colToUpdate.collapseTo = config[i].collapseTo ?? '';
+					colToUpdate.isCollapsed = config[i].isCollapsed || false; // in case it wasn't defined, set to false
+					colToUpdate.align = config[i].align || colToUpdate.align;
 				}
 			}
 		}
@@ -139,12 +136,12 @@ namespace Providers.DataGrid.Wijmo.Feature {
 
 			const config = JSON.parse(state);
 			this._grid.provider.deferUpdate(() => {
-				this._reloadColumns(config);
 				this._grid.features.filter.setViewLayout(config);
 				this._grid.features.groupPanel.setViewLayout(config);
 				this._grid.features.sort.setViewLayout(config);
 				this._grid.features.columnFreeze.setViewLayout(config);
 				this._setGroups(this._grid.provider.columnGroups, config.groupColumns);
+				this._reloadColumns(config);
 			});
 		}
 	}