Merge branch 'master' into 1.0

Author: marshallswain

README.md

@@ -12,6 +12,9 @@
 npm install feathers-vuex --save
 ```
 
+## Important
+The current version of `feathers-vuex` is not compatible with the latest version of `feathers-reactive` (0.5.x). To keep on using `feathers-vuex` install version 0.4.x.
+
 ## Use
 `feathers-vuex` is a set of two utilities for integrating the Feathers Client into your Vuex store.  It allows you to eliminate boilerplate and easily customize the store.  To get it working, we first need a Feathers Client.  Note: as of version 1.0.0 `feathers-reactive` is no longer required to get socket updates.
 

src/service-module/mutations.js

@@ -127,9 +127,16 @@ export default function makeServiceMutations (servicePath) {
       }
     },
 
-    setCurrent (state, item) {
-      const { idField } = state
-      let id = isObject(item) ? item[idField] : item
+    setCurrent (state, itemOrId) {
+      let id
+      let item
+      if (isObject(itemOrId)) {
+        id = itemOrId[idField]
+        item = itemOrId
+      } else {
+        id = itemOrId
+        item = state.keyedById[id]
+      }
       state.currentId = id
       state.copy = _cloneDeep(item)
     },

test/service-module/mutations.test.js

@@ -249,6 +249,11 @@ describe('Service Module - Mutations', function () {
 
     assert(state.currentId === 2)
     assert.deepEqual(state.copy, item2)
+
+    setCurrent(state, item1._id)
+
+    assert(state.currentId === 1)
+    assert.deepEqual(state.copy, item1)
   })
 
   it('clearCurrent', function () {