Refresh (#44)

* #43 Data grid now handles data refresh
madmax983 · Jan 30, 2018 · de6ff48 · de6ff48
1 parent 51bad53
commit de6ff48
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 10 deletions.
diff --git a/force-app/main/default/aura/DataGrid/DataGrid.cmp b/force-app/main/default/aura/DataGrid/DataGrid.cmp
@@ -28,8 +28,7 @@
     <aura:attribute name="offSetIndex"
                     access="public"
                     type="integer"
-                    description="The index of the current data offset"
-                    default="0"/>
+                    description="The index of the current data offset"/>
     <aura:attribute name="title" type="Aura.Component[]" access="global"/>
     <aura:attribute name="toolbarButtons" type="Aura.Component[]" access="global"/>
     <aura:attribute name="toolbarBody" type="Aura.Component[]" access="global"/>
@@ -46,6 +45,7 @@
 
     <!--         Methods        -->
     <aura:method name="init" action="{!c.dataGridInit}"/>
+    <aura:method name="refresh" action="{!c.refresh}"/>
 
     <!--        Handlers        -->
     <aura:handler name="childToggle"

diff --git a/force-app/main/default/aura/DataGrid/DataGridController.js b/force-app/main/default/aura/DataGrid/DataGridController.js
@@ -14,6 +14,10 @@
             component.set("v.initFired", true)
         }
     },
+    refresh: function(component, event, helper) {
+        helper.toggleSpinner(component);
+        component.init();
+    },
     lodashLoaded: function(component) {
         component.set("v.lodashLoaded", true);
         var initFired = component.get("v.initFired");

diff --git a/force-app/main/default/aura/DataGrid/DataGridHelper.js b/force-app/main/default/aura/DataGrid/DataGridHelper.js
@@ -70,10 +70,10 @@
     treeInit: function(component) {
         var config = component.get("v.config"), scrollable = config.scrollable;
         var data = component.get("v.data"),
-            offSetIndex = component.get("v.offSetIndex"),
             displaySize = component.get("v.config.rowsDisplayed")
                 ? component.get("v.config.rowsDisplayed")
                 : 20,
+            offSetIndex = component.get("v.offSetIndex") ? component.get("v.offSetIndex") : displaySize,
             self = this;
 
         var promises = self.getRootNodes(data);
@@ -88,14 +88,14 @@
                     var mChildren = component.mChildren.entries();
                     component.mChildren = new Map([...component.mChildren, ...value]);
                 });
-
-                var offSetData = parents.slice(offSetIndex, displaySize);
+                var rangeStart = offSetIndex - displaySize;
+                var offSetData = parents.slice(rangeStart, offSetIndex);
                 self.setHasChildren(offSetData, component.mChildren);
 
                 self.toggleSpinner(component);
                 component.set("v.hierarchy", parents);
                 component.set("v.view", offSetData);
-                component.set("v.offSetIndex", displaySize);
+                component.set("v.offSetIndex", rangeStart + displaySize);
             });
         });
         if(scrollable) {
@@ -105,16 +105,17 @@
     gridInit: function(component) {
         var config = component.get("v.config"), scrollable = config.scrollable;
         var data = component.get("v.data"),
-            offSetIndex = component.get("v.offSetIndex"),
             displaySize = component.get("v.config.rowsDisplayed")
                 ? component.get("v.config.rowsDisplayed")
-                : 20;
+                : 20,
+            offSetIndex = component.get("v.offSetIndex") ? component.get("v.offSetIndex") : displaySize;
 
         this.toggleSpinner(component);
-        var offSetData = data.slice(offSetIndex, displaySize);
+        var rangeStart = offSetIndex - displaySize;
+        var offSetData = data.slice(rangeStart, offSetIndex);
         component.set("v.hierarchy", data);
         component.set("v.view", offSetData);
-        component.set("v.offSetIndex", displaySize);
+        component.set("v.offSetIndex", rangeStart + displaySize);
 
         if(scrollable) {
             component.mouseWheelHandler = this.mouseWheelHandler("v.hierarchy", component);

diff --git a/force-app/test/default/staticresources/lightningDataGridTests.resource b/force-app/test/default/staticresources/lightningDataGridTests.resource
@@ -136,6 +136,22 @@ describe("Grid Tests", function() {
             });
         });
 
+        it('handles a data refresh', function(done) {
+           return $T.waitFor(function() {
+               var grid = cmp.find("exampleGrid");
+               return grid.get("v.view").length > 0;
+           }).then(function(){
+               var grid = cmp.find("exampleGrid");
+               var data = grid.get("v.data");
+               data[0].data.name = "Captain Hook";
+               grid.set("v.data", data);
+               grid.refresh();
+               var view = grid.get("v.view");
+               expect(view[0].data.name).toBe("Captain Hook");
+               done();
+           });
+        });
+
         it('handles a cell edit', function(done) {
             return $T.waitFor(function() {
                 var grid = cmp.find("exampleGrid");