feat(tasks): do task container queries properly

depends on updates to `feathers-action` and `feathers-action-react`

- root-systems/feathers-action#19
- https://github.com/ahdinosaur/feathers-action-react

Author: ahdinosaur

package.json

@@ -65,8 +65,8 @@
     "dog-names": "^1.0.2",
     "dogstack": "^0.4.0",
     "dogstack-agents": "^0.4.3",
-    "feathers-action": "^2.2.0",
-    "feathers-action-react": "github:ahdinosaur/feathers-action-react#luddite",
+    "feathers-action": "^2.3.0",
+    "feathers-action-react": "^2.2.1",
     "feathers-errors": "^2.6.2",
     "feathers-hooks-common": "^3.0.0",
     "feathers-knex": "^2.6.3",

tasks/components/SetupGroupTask.js

@@ -18,7 +18,7 @@ export default (props) => {
 
   const { profile, sourceRelationships } = contextAgent
 
-  console.log(sourceRelationships)
+  console.log('sourceRelationships', sourceRelationships)
 
   const steps = [
     {

tasks/containers/SetupGroupTask.js

@@ -23,6 +23,7 @@ export default compose(
       var queries = []
       //  once we have the task plan, query for the context agent
       const { taskPlan } = props
+
       if (taskPlan) {
         const { params: { contextAgentId, contextAgent } } = taskPlan
         queries.push({
@@ -48,6 +49,7 @@ export default compose(
 
         if (contextAgent) {
           const { sourceRelationships } = contextAgent
+
           sourceRelationships.forEach(relationship => {
             const { targetId } = relationship
             queries.push({
@@ -77,11 +79,9 @@ export default compose(
       return queries
     },
     shouldQueryAgain: (props, status) => {
-      console.log('querrrrrrrrrrry')
       if (status.isPending) return false
-      debugger
 
-      const { taskPlan } = props.selected
+      const { taskPlan } = props.ownProps
 
       // wait for task plan before re-query
       if (isNil(taskPlan)) return false
@@ -90,7 +90,6 @@ export default compose(
       const contextAgent = getContextAgentFromTaskPlan(taskPlan)
 
       if (isNil(contextAgent)) return true
-      debugger
       if (anyTargetsAreNil(contextAgent)) return true
 
       return false

tasks/containers/TaskWorker.js

@@ -1,5 +1,5 @@
 import h from 'react-hyperscript'
-import { isNil } from 'ramda'
+import { isNil, pipe, filter, keys, length, gte, propEq, not } from 'ramda'
 import { connect as connectFeathers } from 'feathers-action-react'
 import { compose } from 'recompose'
 import { push } from 'react-router-redux'
@@ -75,7 +75,7 @@ export default compose(
       // re-query when we haven't gotten back taskWork
       const { taskWork } = taskPlan
 
-      if (isNil(taskWork)) return true
+      if (not(hasQueriedTaskWorks(status.requests))) return true
 
       return false
     }
@@ -100,3 +100,10 @@ export default compose(
     actions.router.push(nextRoute)
   }
 })
+
+const hasQueriedTaskWorks = pipe(
+  filter(propEq('service', 'taskWorks')),
+  keys,
+  length,
+  gte(1)
+)