From 200c70b6c0c3593275e158493869466039b53595 Mon Sep 17 00:00:00 2001
From: Diego Antonelli <diego.antonelli@mendix.com>
Date: Mon, 28 Jun 2021 09:34:17 +0200
Subject: [PATCH] Fix sort view state

---
 CHANGELOG.md                                    | 6 ++++++
 package.json                                    | 2 +-
 src/Shared/DataSourceHelper/DataSourceHelper.ts | 2 +-
 src/package.xml                                 | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a384acd..19467e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## 1.3.15 - 2021-06-28
+
+### Fixed
+
+-  We fixed a regression introduced in v1.3.10 which causes `Header Sort` and `Drop down Sort` to not keep the list view sorted when pressing back button.
+
 ## 1.3.14 - 2021-06-22
 
 ### Fixed
diff --git a/package.json b/package.json
index 46e929e..9e0988f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "list-view-controls",
   "widgetName": "ListViewControls",
-  "version": "1.3.14",
+  "version": "1.3.15",
   "description": "Search and filter Mendix list views",
   "copyright": "Mendix BV",
   "scripts": {
diff --git a/src/Shared/DataSourceHelper/DataSourceHelper.ts b/src/Shared/DataSourceHelper/DataSourceHelper.ts
index 3811c04..cb73576 100644
--- a/src/Shared/DataSourceHelper/DataSourceHelper.ts
+++ b/src/Shared/DataSourceHelper/DataSourceHelper.ts
@@ -49,7 +49,7 @@ export class DataSourceHelper {
         aspect.after(widget, "storeState", (store: (key: string, value: any) => void) => {
             mx.logger.debug("after storeState");
             if (widget.__customWidgetDataSourceHelper) {
-                const sorting = widget.__customWidgetDataSourceHelper.sorting && widget.__customWidgetDataSourceHelper.originalSort;
+                const sorting = widget.__customWidgetDataSourceHelper.sorting.length > 0 ? widget.__customWidgetDataSourceHelper.sorting : widget.__customWidgetDataSourceHelper.originalSort;
                 store("lvcSorting", sorting);
                 store("lvcConstraints", widget.__customWidgetDataSourceHelper.constraints);
                 store("lvcPaging", widget.__customWidgetDataSourceHelper.paging);
diff --git a/src/package.xml b/src/package.xml
index 204d0b2..431781a 100644
--- a/src/package.xml
+++ b/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="ListViewControls" version="1.3.14" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="ListViewControls" version="1.3.15" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="CheckBoxFilter/CheckBoxFilter.xml"/>
             <widgetFile path="DropDownFilter/DropDownFilter.xml"/>