Bugfixes (#21)

Author: JelteMX

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mxtreetable",
   "widgetName": "MxTreeTable",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "TreeTable widget",
   "copyright": "Mendix 2019",
   "author": "Jelte Lagendijk <jelte.lagendijk@mendix.com>",

src/MxTreeTable.tsx

@@ -773,10 +773,14 @@ Your context object is of type "${contextEntity}". Please check the configuratio
         const {
             stateManagementType,
             stateLocalStorageKey,
+            stateLocalStorageKeyIncludeGUID,
             stateExecuteSelectActionOnRestore,
             stateLocalStorageType
         } = this.props;
-        const key = stateLocalStorageKey !== "" ? `TreeTableState-${stateLocalStorageKey}` : `TreeTableState-${guid}`;
+        const key =
+            stateLocalStorageKey !== ""
+                ? `TreeTableState-${stateLocalStorageKey}${stateLocalStorageKeyIncludeGUID ? `-${guid}` : ""}`
+                : `TreeTableState-${guid}`;
         const currentDateTime = +new Date();
         const emptyState: TableState = {
             context: guid,
@@ -819,14 +823,21 @@ Your context object is of type "${contextEntity}". Please check the configuratio
     private _writeTableState(state: TableState): void {
         // We're doing this the dirty way instead of Object.assign because IE11 sucks
         const writeState = JSON.parse(JSON.stringify(state)) as TableState;
-        const { stateManagementType, stateLocalStorageKey, stateLocalStorageType } = this.props;
+        const {
+            stateManagementType,
+            stateLocalStorageKey,
+            stateLocalStorageKeyIncludeGUID,
+            stateLocalStorageType
+        } = this.props;
         if (stateManagementType === "disabled" /* || stateManagementType === "mendix"*/) {
             return;
         }
         this.debug("writeTableState", writeState);
         const key =
             stateLocalStorageKey !== ""
-                ? `TreeTableState-${stateLocalStorageKey}`
+                ? `TreeTableState-${stateLocalStorageKey}${
+                      stateLocalStorageKeyIncludeGUID ? `-${writeState.context}` : ""
+                  }`
                 : `TreeTableState-${writeState.context}`;
         writeState.lastUpdate = +new Date();
         if (stateLocalStorageType === "session") {

src/MxTreeTable.xml

@@ -557,6 +557,10 @@ Note: State management (currently) ONLY works when you load a whole tree (see Da
                     <caption>Key</caption>
                     <description>When storing the state in local storage, it will choose a specific key, based on the the GUID of your context. If you happen to use a non-persistent context, this will change every time. In that case you can set a key here (make it unique for your current view). Otherwise, leave it empty.</description>
                 </property>
+                <property key="stateLocalStorageKeyIncludeGUID" type="boolean" defaultValue="false">
+                    <caption>Include guid</caption>
+                    <description>When you set a key you can still add the GUID if needed. This is not useful when using non-persistent objects</description>
+                </property>
                 <property key="stateExecuteSelectActionOnRestore" type="boolean" defaultValue="true">
                     <caption>Restore selection action</caption>
                     <description>When you restore your state, and you have an On Change action defined for your selection (see Selection tab), you can execute this. This is enabled by default.</description>

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="MxTreeTable" version="2.0.6" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="MxTreeTable" version="2.0.7" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="MxTreeTable.xml"/>
         </widgetFiles>

src/store/index.ts

@@ -59,7 +59,7 @@ export interface NodeStoreConstructorOptions {
     convertMxObjectToRow: (mxObject: mendix.lib.MxObject, parentKey?: string | null) => Promise<TreeRowObject>;
     getInitialTableState: (guid: string) => TableState;
     writeTableState: (state: TableState) => void;
-    onSelect: (ids: string[]) => void;
+    onSelect: (ids?: string[]) => void;
     resetColumns: (col: string) => void;
     reset: () => void;
     debug: (...args: unknown[]) => void;
@@ -89,7 +89,7 @@ export class NodeStore {
     private convertMxObjectToRow: (mxObject: mendix.lib.MxObject, parentKey?: string | null) => Promise<TreeRowObject>;
     private getInitialTableState: (guid: string) => TableState;
     private writeTableState: (state: TableState) => void;
-    private onSelect: (ids: string[]) => void;
+    private onSelect: (ids?: string[]) => void;
 
     private selectionMode: SelectionMode;
     private dataResetOnContextChange: boolean;
@@ -526,13 +526,15 @@ export class NodeStore {
         return this.rowObjects.filter(findRow => findRow._parent && findRow._parent === row.key).length > 0;
     }
 
-    private _setSelectedFromExternal(guids: string | string[]): void {
+    private _setSelectedFromExternal(guids?: null | string | string[]): void {
         if (this.selectionMode === "none") {
             return;
         }
 
         let selected: RowObject[] = [];
-        if (Array.isArray(guids)) {
+        if (typeof guids === "undefined" || guids === null) {
+            selected = [];
+        } else if (Array.isArray(guids)) {
             selected = guids.map(guid => this.findRowObject(guid)).filter(obj => obj !== null) as RowObject[];
         } else {
             const object = this.findRowObject(guids);
@@ -561,6 +563,9 @@ export class NodeStore {
             this.setSelected(selectedGuids);
             this.setExpanded(parentGuids);
             this.onSelect(selectedGuids);
+        } else if (selected.length === 0) {
+            this.setSelected();
+            this.onSelect();
         }
     }
 

typings/MxTreeTableProps.d.ts

@@ -116,6 +116,7 @@ export interface MxTreeTableContainerProps extends CommonProps {
     stateLocalStorageTime: number;
     stateLocalStorageType: StateManagementStorage;
     stateLocalStorageKey: string;
+    stateLocalStorageKeyIncludeGUID: boolean;
     stateExecuteSelectActionOnRestore: boolean;
     // stateEntity: string;
     // getStateObjectMicroflow: string;