allow setLocalItems of null

niiknow · Jan 21, 2020 · 6e6d634 · 6e6d634
1 parent a744a8a
commit 6e6d634
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 13 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/mix-manifest.json b/dist/mix-manifest.json
@@ -1,4 +1,4 @@
 {
-    "/index.js": "/index.js?id=8daa0f095eef6a843955",
-    "/index.js.map": "/index.js.map?id=69bf9bc699358f0e925a"
+    "/index.js": "/index.js?id=5cbf00264114758a7830",
+    "/index.js.map": "/index.js.map?id=4cb22523419a59d7d2eb"
 }
diff --git a/example/index.js b/example/index.js
@@ -41697,10 +41697,10 @@ function () {
     value: function setLocalItems(items) {
       var that = this;
       that.currentPage = 1;
-      that.totalRows = items.length;
       that.startRow = 1;
-      that.endRow = that.totalRows;
       that.perPage = -1;
+      that.totalRows = items ? items.length : -1;
+      that.endRow = that.totalRows;
 
       _localItems.set(this, items);
     }

diff --git a/example/index.js.map b/example/index.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bvtnet-items-provider",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "datatables.net ajax items provider for bootstrap-vue b-table",
   "author": "Tom Noogen",
   "main": "dist/index.js",

diff --git a/src/index.js b/src/index.js
@@ -146,12 +146,12 @@ class ItemsProvider {
    * @param Array items list of local items
    */
   setLocalItems(items) {
-    const that = this
+    const that       = this
     that.currentPage = 1
-    that.totalRows   = items.length
     that.startRow    = 1
-    that.endRow      = that.totalRows
     that.perPage     = -1
+    that.totalRows   = items ? items.length : -1
+    that.endRow      = that.totalRows
 
     _localItems.set(this, items)
   }

diff --git a/tests/itemsprovider.specs.js b/tests/itemsprovider.specs.js
@@ -31,3 +31,14 @@ test('ItemsProvider executeQuery returns local items', t => {
   t.is(ip.perPage, -1)
   t.is(items[0].name, 'test')
 })
+
+test('ItemsProvider.setLocalItems with nulls result in empty array', t => {
+  const ip = new ItemsProvider(null, [])
+  ip.setLocalItems(null)
+
+  const items = ip.getLocalItems()
+
+  t.is(items, null)
+  t.is(ip.totalRows, -1)
+  t.is(ip.perPage, -1)
+})