Merge pull request #276 from smartprocure/feature/call-onUpdateByOthers-after-results

Revert some changes

Author: stellarhoof

.changeset/mighty-crabs-pretend.md

@@ -0,0 +1,5 @@
+---
+'contexture-client': patch
+---
+
+Revert back to running onUpdateByOthers before running the search

packages/client/src/index.js

@@ -134,17 +134,13 @@ export let ContextTree = _.curry(
         _.map(snapshot),
         _.find({ path: snapshot(event.path) })
       )(updatedNodes)
-      if (!affectsSelf)
-        await Promise.all(
-          _.map((n) => {
-            // When updated by others, force replace instead of merge response
-            extend(n, { forceReplaceResponse: true })
-          }, updatedNodes)
-        )
-
-      for (const n of _.remove({ path: snapshot(event.path) }, updatedNodes)) {
-        extend(n, { wasUpdatedByOthers: true })
-      }
+      await Promise.all(
+        _.map((n) => {
+          // When updated by others, force replace instead of merge response
+          extend(n, { forceReplaceResponse: true })
+          runTypeFunction(types, 'onUpdateByOthers', n, actionProps)
+        }, _.remove({ path: snapshot(event.path) }, updatedNodes))
+      )
 
       // If disableAutoUpdate but this dispatch affects the target node, update *just* that node (to allow things like paging changes to always go through)
       // The assumption here is that any event that affects the target node would likely be assumed to take effect immediately by end users
@@ -232,10 +228,6 @@ export let ContextTree = _.curry(
           else {
             target.forceReplaceResponse = false
             extend(target, responseNode)
-            if (target.wasUpdatedByOthers) {
-              delete target.wasUpdatedByOthers
-              runTypeFunction(types, 'onUpdateByOthers', target, actionProps)
-            }
           }
           if (debug && node._meta) target.metaHistory.push(node._meta)
         }

packages/client/src/node.js

@@ -30,7 +30,6 @@ export let internalStateKeys = [
   'onMarkForUpdate',
   'afterSearch',
   'forceReplaceResponse',
-  'wasUpdatedByOthers',
   'expand',
   'collapse',
 ]