@live-change/task-frontend 0.8.32 → 0.8.33

package/.nx/cache/file-map.json

@@ -4,42 +4,42 @@
   "deps": {
     "@codemirror/language": "6.10.1",
     "@dotenvx/dotenvx": "0.27.0",
-    "@fortawesome/fontawesome-free": "^6.4.2",
-    "@live-change/access-control-frontend": "0.8.23",
-    "@live-change/access-control-service": "0.8.23",
-    "@live-change/backup-service": "0.8.23",
-    "@live-change/blog-frontend": "0.8.23",
-    "@live-change/blog-service": "0.8.23",
-    "@live-change/cli": "0.8.23",
-    "@live-change/content-frontend": "0.8.23",
-    "@live-change/content-service": "0.8.23",
-    "@live-change/dao": "0.8.23",
-    "@live-change/dao-vue3": "0.8.23",
-    "@live-change/dao-websocket": "0.8.23",
-    "@live-change/db-client": "0.8.23",
-    "@live-change/email-service": "0.8.23",
-    "@live-change/framework": "0.8.23",
-    "@live-change/frontend-auto-form": "0.8.23",
-    "@live-change/frontend-base": "0.8.23",
-    "@live-change/geoip-service": "0.8.23",
-    "@live-change/image-frontend": "0.8.23",
-    "@live-change/locale-settings-service": "0.8.23",
-    "@live-change/password-authentication-service": "0.8.23",
-    "@live-change/prosemirror-service": "0.8.23",
-    "@live-change/secret-code-service": "0.8.23",
-    "@live-change/secret-link-service": "0.8.23",
-    "@live-change/session-service": "0.8.23",
-    "@live-change/upload-frontend": "0.8.23",
-    "@live-change/url-frontend": "0.8.23",
-    "@live-change/url-service": "0.8.23",
-    "@live-change/vote-service": "0.8.23",
-    "@live-change/task-service": "0.8.23",
-    "@live-change/user-frontend": "0.8.23",
-    "@live-change/user-identification-service": "0.8.23",
-    "@live-change/user-service": "0.8.23",
-    "@live-change/vue3-components": "0.8.23",
-    "@live-change/vue3-ssr": "0.8.23",
-    "@live-change/wysiwyg-frontend": "0.8.23",
+    "@fortawesome/fontawesome-free": "^6.5.2",
+    "@live-change/access-control-frontend": "0.8.32",
+    "@live-change/access-control-service": "0.8.32",
+    "@live-change/backup-service": "0.8.32",
+    "@live-change/blog-frontend": "0.8.32",
+    "@live-change/blog-service": "0.8.32",
+    "@live-change/cli": "0.8.32",
+    "@live-change/content-frontend": "0.8.32",
+    "@live-change/content-service": "0.8.32",
+    "@live-change/dao": "0.8.32",
+    "@live-change/dao-vue3": "0.8.32",
+    "@live-change/dao-websocket": "0.8.32",
+    "@live-change/db-client": "0.8.32",
+    "@live-change/email-service": "0.8.32",
+    "@live-change/framework": "0.8.32",
+    "@live-change/frontend-auto-form": "0.8.32",
+    "@live-change/frontend-base": "0.8.32",
+    "@live-change/geoip-service": "0.8.32",
+    "@live-change/image-frontend": "0.8.32",
+    "@live-change/locale-settings-service": "0.8.32",
+    "@live-change/password-authentication-service": "0.8.32",
+    "@live-change/prosemirror-service": "0.8.32",
+    "@live-change/secret-code-service": "0.8.32",
+    "@live-change/secret-link-service": "0.8.32",
+    "@live-change/session-service": "0.8.32",
+    "@live-change/task-service": "0.8.32",
+    "@live-change/upload-frontend": "0.8.32",
+    "@live-change/url-frontend": "0.8.32",
+    "@live-change/url-service": "0.8.32",
+    "@live-change/user-frontend": "0.8.32",
+    "@live-change/user-identification-service": "0.8.32",
+    "@live-change/user-service": "0.8.32",
+    "@live-change/vote-service": "0.8.32",
+    "@live-change/vue3-components": "0.8.32",
+    "@live-change/vue3-ssr": "0.8.32",
+    "@live-change/wysiwyg-frontend": "0.8.32",
     "@vueuse/core": "^10.9.0",
     "codeceptjs-assert": "^0.0.5",
     "compression": "^1.7.4",
@@ -59,7 +59,7 @@
     "vue-i18n": "^9.10.1",
     "vue-router": "^4.2.5",
     "vue3-scroll-border": "0.1.6",
-    "@live-change/codeceptjs-helper": "0.8.23",
+    "@live-change/codeceptjs-helper": "0.8.32",
     "codeceptjs": "^3.5.12",
     "generate-password": "1.7.1",
     "playwright": "^1.41.2",
@@ -82,7 +82,7 @@
       },
       {
         "file": "LICENSE",
-        "hash": "11061867800085944532"
+        "hash": "10221119794387200971"
       },
       {
         "file": "data/GeoLite2-Country.mmdb",
@@ -174,15 +174,27 @@
       },
       {
         "file": "front/src/Index.vue",
-        "hash": "6141752239478277683"
+        "hash": "15104691593361452519"
+      },
+      {
+        "file": "front/src/ShelterProgress.vue",
+        "hash": "10500323481502622407"
       },
       {
         "file": "front/src/analytics/index.js",
         "hash": "492811393913301668"
       },
       {
-        "file": "front/src/components/Clock.vue",
-        "hash": "6241258097645393918"
+        "file": "front/src/components/BuildShelterResult.vue",
+        "hash": "12307738355148781708"
+      },
+      {
+        "file": "front/src/components/MakePlanksResult.vue",
+        "hash": "15891030442450754519"
+      },
+      {
+        "file": "front/src/components/Task.vue",
+        "hash": "690040641751569935"
       },
       {
         "file": "front/src/config.js",
@@ -198,7 +210,7 @@
       },
       {
         "file": "front/src/router.js",
-        "hash": "16714073484061964064"
+        "hash": "15530460209801505227"
       },
       {
         "file": "front/tsconfig.json",
@@ -212,17 +224,21 @@
         "file": "front/vite.config.ts",
         "hash": "4804285485121244435"
       },
+      {
+        "file": "front/vite.config.ts.timestamp-1717571300028-addad6453ee85.mjs",
+        "hash": "17152765440974688639"
+      },
       {
         "file": "index.js",
-        "hash": "11269213519712721017"
+        "hash": "15558335606886518311"
       },
       {
         "file": "package.json",
-        "hash": "11328295818425146716"
+        "hash": "17822390086587439626"
       },
       {
         "file": "server/app.config.js",
-        "hash": "11753059881031204026"
+        "hash": "3863281573320850472"
       },
       {
         "file": "server/init.js",
@@ -238,7 +254,7 @@
       },
       {
         "file": "server/services.list.js",
-        "hash": "7926432475169575282"
+        "hash": "4032859481033847252"
       },
       {
         "file": "server/start.js",
@@ -246,7 +262,7 @@
       },
       {
         "file": "server/testTasks.js",
-        "hash": "3244421341483603138"
+        "hash": "14976257887791558210"
       },
       {
         "file": "start-dev-docker.sh",

package/front/src/Index.vue

@@ -1,15 +1,16 @@
 <template>
   <div class="flex flex-row w-full justify-content-evenly">
     <div class="surface-card shadow-1 border-round px-3 py-1">
-      <h2>Built shelters</h2>
 
       <div>
-
+        <h2>Built shelters</h2>
+        <pre>{{ shelters }}</pre>
       </div>
 
-      <command-form service="testTasks" action="buildShelter" reset-on-done v-slot="{ data, definition }">
-        <pre>{{ definition.properties }}</pre>
-        <pre>{{data}}</pre>
+      <command-form service="testTasks" action="buildShelter" reset-on-done v-slot="{ data, definition }"
+                    @done="handleStarted">
+<!--        <pre>{{ definition.properties }}</pre>
+        <pre>{{ data }}</pre>-->
 
         <div class="text text-xl">
           Size:
@@ -42,16 +43,32 @@
 
       </command-form>
     </div>
-    <div class="surface-card shadow-1 border-round px-3 py-1">
+<!--    <div class="surface-card shadow-1 border-round px-3 py-1">
+      <h2>Root</h2>
+      <pre>{{ tasksRoot }}</pre>
       <h2>Tasks</h2>
-
-    </div>
+      <Task v-for="task in rootTasks" :key="task.id" :task="task" :tasks="tasks" :task-types="taskTypes" />
+    </div>-->
   </div>
 </template>
 
 <script setup>
+  import { ref, computed } from 'vue'
+  import { usePath, live } from '@live-change/vue3-ssr'
+  import { useRouter } from 'vue-router'
+
+  const path = usePath()
+
+  const router = useRouter()
 
+  const [ shelters ] = await Promise.all([
+    live(path.testTasks.shelters({})),
+  ])
 
+  function handleStarted({ parameters, result }) {
+    console.log("Started", parameters, result)
+    router.push({ name: 'progress', params: { action: result.cause }})
+  }
 
 </script>
 

package/front/src/ShelterProgress.vue

@@ -0,0 +1,89 @@
+<template>
+  <div class="flex flex-row w-full justify-content-evenly">
+    <div class="surface-card shadow-1 border-round px-3 py-1 w-full">
+      <h2>Tasks</h2>
+      <Task v-for="task in rootTasks" :key="task.id" :task="task" :tasks="tasks" :task-types="taskTypes" />
+<!--      <pre>{{ rootTasks }}</pre>-->
+    </div>
+  </div>
+<!--  <pre>{{ tasks }}</pre>-->
+</template>
+
+<script setup>
+  import { ref, computed, defineProps } from 'vue'
+  import { usePath, live } from '@live-change/vue3-ssr'
+  import BuildShelterResult from './components/BuildShelterResult.vue'
+  import MakePlanksResult from './components/MakePlanksResult.vue'
+
+  const props = defineProps({
+    action: {
+      type: Object,
+      required: true
+    }
+  })
+
+  const taskTypes = {
+    buildShelter: {
+      label(task) {
+        return `Building shelter`
+          +` ${task.properties.size.width}x${task.properties.size.height}x${task.properties.size.length}`
+          +` at ${task.properties.place}`
+          +` with ${task.properties.woodType} wood`
+      },
+      resultComponent: BuildShelterResult
+    },
+    makePlanks: {
+      label(task) {
+        return `Making planks from ${task.properties.woodType} wood`
+      },
+      resultComponent: MakePlanksResult
+    },
+    getWood: {
+      label(task) {
+        return `Getting ${task.properties.woodType} wood`
+      }
+    },
+    cutWood: {
+      label(task) {
+        return `Cutting ${task.properties.wood.woodType} wood`
+      }
+    },
+    buildWall: {
+      label(task) {
+        return `Building wall with ${task.properties.wallSize} planks`
+      }
+    },
+    buildRoof: {
+      label(task) {
+        return `Building roof with ${task.properties.roofSize} planks`
+      }
+    },
+    placePlank: {
+      label(task) {
+        return `Placing plank`
+      }
+    }
+  }
+
+  const tasksRoot = computed(() => ({
+    rootType: 'userAction',
+    root: props.action
+  }))
+
+  const path = usePath()
+
+  const tasksPath = computed(
+    () => tasksRoot.value ? path.task.tasksByRoot(tasksRoot.value) : null
+  )
+
+  const [ tasks ] = await Promise.all([
+    live(tasksPath)
+  ])
+
+  const rootTasks = computed(() => tasks.value ? tasks.value.filter(t => t.causeType !== 'task_Task') : [])
+
+</script>
+
+<style scoped>
+
+</style>

package/front/src/components/BuildShelterResult.vue

@@ -0,0 +1,42 @@
+<template>
+  <div class="flex flex-row justify-content-between flex-wrap">
+    <div class="font-semibold">
+      Built shelter with:
+    </div>
+    <div v-for="part in result.walls"
+         :class="`bg-gray-200 px-1 mx-2 border-round`">
+      <span>Wall</span>
+      <span class="ml-1">({{ part.size }})</span>
+    </div>
+    <div v-for="part in [result.roof]"
+         :class="`bg-gray-200 px-1 mx-2 border-round`">
+      <span>Roof</span>
+      <span class="ml-1">({{ part.size }})</span>
+    </div>
+  </div>
+</template>
+
+<script setup>
+  import { defineProps, toRefs } from 'vue'
+
+  const props = defineProps({
+    result: {
+      type: Object,
+      required: true
+    },
+    task: {
+      type: Object,
+      default: () => ({})
+    },
+    taskType: {
+      type: Object,
+      default: () => ({})
+    }
+  })
+
+  const { result } = toRefs(props)
+</script>
+
+<style scoped>
+
+</style>

package/front/src/components/MakePlanksResult.vue

@@ -0,0 +1,37 @@
+<template>
+  <div class="flex flex-row">
+    <div class="font-semibold">
+      Made:
+    </div>
+    <div v-for="part in result"
+         :class="`bg-yellow-200 px-1 mx-2 border-round`">
+      <span>{{ part.woodType }}</span>
+      <span class="ml-1">plank</span>
+    </div>
+  </div>
+</template>
+
+<script setup>
+  import { defineProps, toRefs } from 'vue'
+
+  const props = defineProps({
+    result: {
+      type: Object,
+      required: true
+    },
+    task: {
+      type: Object,
+      default: () => ({})
+    },
+    taskType: {
+      type: Object,
+      default: () => ({})
+    }
+  })
+
+  const { result } = toRefs(props)
+</script>
+
+<style scoped>
+
+</style>

package/front/src/components/Task.vue

@@ -0,0 +1,104 @@
+<template>
+  <div>
+    <div class="text-lg flex flex-row justify-content-between flex-wrap" :class="taskColor">
+      <div class="flex flex-row align-items-center mr-3">
+        <i :class="['pi', icon, taskColor]" style="font-size: 1rem" />
+        <div :class="['ml-2']">{{ label }}</div>
+      </div>
+      <div v-if="task?.progress && task?.state !== 'done'" class="w-8rem mr-3 flex-grow-1" style="max-width: 50vw">
+        <ProgressBar :value="(100 * task.progress.current / task.progress.total).toFixed()" />
+      </div>
+      <div v-if="task?.retries?.length" class="mr-3">
+        <i class="pi pi-replay" />
+        {{ task.retries.length }} / {{ task.maxRetries }}
+      </div>
+      <div>{{ task?.state !== 'done' ? (task?.progress?.action || task?.state) : 'done' }}</div>
+    </div>
+    <div v-for="retry in task?.retries" class="ml-4 flex flex-row justify-content-between text-red-800">
+      {{ retry.error }} at {{ d(retry.failedAt, 'shortestTime')}}
+    </div>
+<!--    <pre>{{ task.progress }}</pre>-->
+    <div v-if="taskResultComponent && task.result" class="m-2">
+      <component :is="taskResultComponent" :task="task" :result="task.result" :taskType="taskType" />
+    </div>
+    <div class="ml-4">
+      <Task v-for="task in childTasks" :key="task.id" :task="task" :tasks="tasks" :taskTypes="taskTypes" />
+    </div>
+  </div>
+</template>
+
+
+<script setup>
+
+  import { ref, onMounted, defineProps, toRefs, computed } from "vue"
+
+  import { useToast } from 'primevue/usetoast'
+  const toast = useToast()
+  import { useConfirm } from 'primevue/useconfirm'
+  const confirm = useConfirm()
+
+  import { useActions, usePath, live } from '@live-change/vue3-ssr'
+  const actions = useActions()
+
+  import { useI18n } from 'vue-i18n'
+  const { t, tm, rt, n, d } = useI18n()
+
+  const props = defineProps({
+    task: {
+      type: Object,
+      required: true
+    },
+    tasks: {
+      type: Array,
+      required: true
+    },
+    taskTypes: {
+      type: Object,
+      default: () => ({})
+    }
+  })
+  const { task, tasks, taskTypes } = toRefs(props)
+
+  const taskId = computed(() => task.value.to || task.value.id)
+  const taskType = computed(() => taskTypes.value[task.value.type || task.value.name] || {})
+
+  const taskResultComponent = computed(() => taskType.value.resultComponent)
+
+  const label = computed(() => {
+    if(taskType.value.label) {
+      if(typeof taskType.value.label == 'function') return taskType.value.label(task.value)
+      return taskType.value.label
+    }
+    return task.value.name || task.value.type
+  })
+
+  const childTasks = computed(
+    () => tasks.value.filter(m => m.causeType === "task_Task" && m.cause === taskId.value)
+  )
+
+  const icon = computed(() => {
+    switch(task.value.state) {
+      case 'created': return 'pi-sparkles'
+      case 'waiting': return 'pi-hourglass pi-spin'
+      case 'running': return 'pi-play'
+      case 'working': return 'pi-spin pi-spinner'
+      case 'done': return 'pi-check'
+      case 'failed': return 'pi-exclamation-triangle'
+      case 'retrying': return 'pi-replay'
+      default: return 'pi-question'
+    }
+  })
+
+  const taskColor = computed(() => {
+    switch(task.value.state) {
+      case 'failed': return 'text-red-600'
+      default: {}
+    }
+  })
+
+</script>
+
+
+<style scoped>
+
+</style>

package/front/src/router.js

@@ -24,6 +24,11 @@ export function routes(config = {}) {
       component: () => import("./Index.vue")
     }),
 
+    route({
+      name: 'progress', path: prefix+'progress/:action', meta: { }, props:true,
+      component: () => import("./ShelterProgress.vue")
+    }),
+
     ...pagesRoutes,
 
     ...contentEditRoutes({ ...config }),
@@ -66,7 +71,7 @@ export function createRouter(app, config) {
         return { name: 'user:settings' }
       }
     }
-    if(to && to.name == 'user:signIn' && from?.matched.find(m => m?.meta.saveForSignIn)) {
+    if(to && to.name === 'user:signIn' && from?.matched.find(m => m?.meta.saveForSignIn)) {
       console.log("SAVE FOR LOGIN", from.fullPath)
       localStorage.redirectAfterLogin = from.fullPath
     }

package/front/vite.config.ts.timestamp-1717571300028-addad6453ee85.mjs

@@ -0,0 +1,39 @@
+// front/vite.config.ts
+import { defineConfig } from "file:///home/m8/IdeaProjects/live-change/node_modules/vite/dist/node/index.js";
+import Pages from "file:///home/m8/IdeaProjects/live-change/node_modules/vite-plugin-pages/dist/index.mjs";
+import baseViteConfig from "file:///home/m8/IdeaProjects/live-change/live-change-stack/frontend/frontend-base/vite-config.js";
+var version = process.env.VERSION ?? "unknown";
+var vite_config_default = defineConfig(async ({ command, mode }) => {
+  const baseConfig = await baseViteConfig({ command, mode });
+  return {
+    ...baseConfig,
+    define: {
+      ...baseConfig.define,
+      ENV_VERSION: JSON.stringify(version),
+      ENV_BRAND_NAME: JSON.stringify("Example"),
+      ENV_BRAND_DOMAIN: JSON.stringify("example.com")
+    },
+    plugins: [
+      ...baseConfig.plugins,
+      Pages({
+        dirs: [
+          // basic
+          { dir: "src/pages", baseRoute: "" }
+          // blog
+          // { dir: 'src/blog', baseRoute: 'blog' },
+        ],
+        extensions: ["vue", "md"]
+      })
+    ],
+    resolve: {
+      ...baseConfig.resolve,
+      alias: [
+        ...baseConfig.resolve.alias
+      ]
+    }
+  };
+});
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiZnJvbnQvdml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCIvaG9tZS9tOC9JZGVhUHJvamVjdHMvbGl2ZS1jaGFuZ2UvbGl2ZS1jaGFuZ2Utc3RhY2svZnJvbnRlbmQvdGFzay1mcm9udGVuZC9mcm9udFwiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL2hvbWUvbTgvSWRlYVByb2plY3RzL2xpdmUtY2hhbmdlL2xpdmUtY2hhbmdlLXN0YWNrL2Zyb250ZW5kL3Rhc2stZnJvbnRlbmQvZnJvbnQvdml0ZS5jb25maWcudHNcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfaW1wb3J0X21ldGFfdXJsID0gXCJmaWxlOi8vL2hvbWUvbTgvSWRlYVByb2plY3RzL2xpdmUtY2hhbmdlL2xpdmUtY2hhbmdlLXN0YWNrL2Zyb250ZW5kL3Rhc2stZnJvbnRlbmQvZnJvbnQvdml0ZS5jb25maWcudHNcIjtpbXBvcnQgeyBkZWZpbmVDb25maWcgfSBmcm9tICd2aXRlJ1xuaW1wb3J0IFBhZ2VzIGZyb20gJ3ZpdGUtcGx1Z2luLXBhZ2VzJ1xuXG5sZXQgdmVyc2lvbiA9IHByb2Nlc3MuZW52LlZFUlNJT04gPz8gJ3Vua25vd24nXG5cbi8vIEB0cy1pZ25vcmVcbmltcG9ydCBiYXNlVml0ZUNvbmZpZyBmcm9tICdAbGl2ZS1jaGFuZ2UvZnJvbnRlbmQtYmFzZS92aXRlLWNvbmZpZy5qcydcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lQ29uZmlnKGFzeW5jICh7IGNvbW1hbmQsIG1vZGUgfSkgPT4ge1xuICBjb25zdCBiYXNlQ29uZmlnID0gKGF3YWl0IGJhc2VWaXRlQ29uZmlnKHsgY29tbWFuZCwgbW9kZSB9KSlcbiAgcmV0dXJuIHtcbiAgICAuLi5iYXNlQ29uZmlnLFxuXG4gICAgZGVmaW5lOiB7XG4gICAgICAuLi5iYXNlQ29uZmlnLmRlZmluZSxcbiAgICAgIEVOVl9WRVJTSU9OOiBKU09OLnN0cmluZ2lmeSh2ZXJzaW9uKSxcbiAgICAgIEVOVl9CUkFORF9OQU1FOiBKU09OLnN0cmluZ2lmeShcIkV4YW1wbGVcIiksXG4gICAgICBFTlZfQlJBTkRfRE9NQUlOOiBKU09OLnN0cmluZ2lmeShcImV4YW1wbGUuY29tXCIpLFxuICAgIH0sXG5cbiAgICBwbHVnaW5zOiBbXG4gICAgICAuLi5iYXNlQ29uZmlnLnBsdWdpbnMsXG4gICAgICBQYWdlcyh7XG4gICAgICAgIGRpcnM6IFtcbiAgICAgICAgICAvLyBiYXNpY1xuICAgICAgICAgIHsgZGlyOiAnc3JjL3BhZ2VzJywgYmFzZVJvdXRlOiAnJyB9LFxuICAgICAgICAgIC8vIGJsb2dcbiAgICAgICAgICAvLyB7IGRpcjogJ3NyYy9ibG9nJywgYmFzZVJvdXRlOiAnYmxvZycgfSxcbiAgICAgICAgXSxcbiAgICAgICAgZXh0ZW5zaW9uczogWyd2dWUnLCAnbWQnXSxcbiAgICAgIH0pLFxuICAgIF0sXG5cbiAgICByZXNvbHZlOiB7XG4gICAgICAuLi5iYXNlQ29uZmlnLnJlc29sdmUsXG4gICAgICBhbGlhczogW1xuICAgICAgICAuLi5iYXNlQ29uZmlnLnJlc29sdmUuYWxpYXMsXG4gICAgICBdXG4gICAgfVxuICB9XG59KVxuIl0sCiAgIm1hcHBpbmdzIjogIjtBQUFrYSxTQUFTLG9CQUFvQjtBQUMvYixPQUFPLFdBQVc7QUFLbEIsT0FBTyxvQkFBb0I7QUFIM0IsSUFBSSxVQUFVLFFBQVEsSUFBSSxXQUFXO0FBS3JDLElBQU8sc0JBQVEsYUFBYSxPQUFPLEVBQUUsU0FBUyxLQUFLLE1BQU07QUFDdkQsUUFBTSxhQUFjLE1BQU0sZUFBZSxFQUFFLFNBQVMsS0FBSyxDQUFDO0FBQzFELFNBQU87QUFBQSxJQUNMLEdBQUc7QUFBQSxJQUVILFFBQVE7QUFBQSxNQUNOLEdBQUcsV0FBVztBQUFBLE1BQ2QsYUFBYSxLQUFLLFVBQVUsT0FBTztBQUFBLE1BQ25DLGdCQUFnQixLQUFLLFVBQVUsU0FBUztBQUFBLE1BQ3hDLGtCQUFrQixLQUFLLFVBQVUsYUFBYTtBQUFBLElBQ2hEO0FBQUEsSUFFQSxTQUFTO0FBQUEsTUFDUCxHQUFHLFdBQVc7QUFBQSxNQUNkLE1BQU07QUFBQSxRQUNKLE1BQU07QUFBQTtBQUFBLFVBRUosRUFBRSxLQUFLLGFBQWEsV0FBVyxHQUFHO0FBQUE7QUFBQTtBQUFBLFFBR3BDO0FBQUEsUUFDQSxZQUFZLENBQUMsT0FBTyxJQUFJO0FBQUEsTUFDMUIsQ0FBQztBQUFBLElBQ0g7QUFBQSxJQUVBLFNBQVM7QUFBQSxNQUNQLEdBQUcsV0FBVztBQUFBLE1BQ2QsT0FBTztBQUFBLFFBQ0wsR0FBRyxXQUFXLFFBQVE7QUFBQSxNQUN4QjtBQUFBLElBQ0Y7QUFBQSxFQUNGO0FBQ0YsQ0FBQzsiLAogICJuYW1lcyI6IFtdCn0K

package/index.js

@@ -1,2 +1,3 @@
+import Task from './front/src/components/Task.vue'
 
-export { }
+export { Task }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/task-frontend",
-  "version": "0.8.32",
+  "version": "0.8.33",
   "scripts": {
     "memDev": "node server/start.js memDev --enableSessions --initScript ./init.js --dbAccess",
     "localDevInit": "rm tmp.db; node server/start.js localDev --enableSessions --initScript ./init.js",
@@ -34,42 +34,42 @@
   "dependencies": {
     "@codemirror/language": "6.10.1",
     "@dotenvx/dotenvx": "0.27.0",
-    "@fortawesome/fontawesome-free": "^6.4.2",
-    "@live-change/access-control-frontend": "^0.8.32",
-    "@live-change/access-control-service": "^0.8.32",
-    "@live-change/backup-service": "^0.8.32",
-    "@live-change/blog-frontend": "^0.8.32",
-    "@live-change/blog-service": "^0.8.32",
-    "@live-change/cli": "^0.8.32",
-    "@live-change/content-frontend": "^0.8.32",
-    "@live-change/content-service": "^0.8.32",
-    "@live-change/dao": "^0.8.32",
-    "@live-change/dao-vue3": "^0.8.32",
-    "@live-change/dao-websocket": "^0.8.32",
-    "@live-change/db-client": "^0.8.32",
-    "@live-change/email-service": "^0.8.32",
-    "@live-change/framework": "^0.8.32",
-    "@live-change/frontend-auto-form": "^0.8.32",
-    "@live-change/frontend-base": "^0.8.32",
-    "@live-change/geoip-service": "^0.8.32",
-    "@live-change/image-frontend": "^0.8.32",
-    "@live-change/locale-settings-service": "^0.8.32",
-    "@live-change/password-authentication-service": "^0.8.32",
-    "@live-change/prosemirror-service": "^0.8.32",
-    "@live-change/secret-code-service": "^0.8.32",
-    "@live-change/secret-link-service": "^0.8.32",
-    "@live-change/session-service": "^0.8.32",
-    "@live-change/task-service": "^0.8.32",
-    "@live-change/upload-frontend": "^0.8.32",
-    "@live-change/url-frontend": "^0.8.32",
-    "@live-change/url-service": "^0.8.32",
-    "@live-change/user-frontend": "^0.8.32",
-    "@live-change/user-identification-service": "^0.8.32",
-    "@live-change/user-service": "^0.8.32",
-    "@live-change/vote-service": "^0.8.32",
-    "@live-change/vue3-components": "^0.8.32",
-    "@live-change/vue3-ssr": "^0.8.32",
-    "@live-change/wysiwyg-frontend": "^0.8.32",
+    "@fortawesome/fontawesome-free": "^6.5.2",
+    "@live-change/access-control-frontend": "^0.8.33",
+    "@live-change/access-control-service": "^0.8.33",
+    "@live-change/backup-service": "^0.8.33",
+    "@live-change/blog-frontend": "^0.8.33",
+    "@live-change/blog-service": "^0.8.33",
+    "@live-change/cli": "^0.8.33",
+    "@live-change/content-frontend": "^0.8.33",
+    "@live-change/content-service": "^0.8.33",
+    "@live-change/dao": "^0.8.33",
+    "@live-change/dao-vue3": "^0.8.33",
+    "@live-change/dao-websocket": "^0.8.33",
+    "@live-change/db-client": "^0.8.33",
+    "@live-change/email-service": "^0.8.33",
+    "@live-change/framework": "^0.8.33",
+    "@live-change/frontend-auto-form": "^0.8.33",
+    "@live-change/frontend-base": "^0.8.33",
+    "@live-change/geoip-service": "^0.8.33",
+    "@live-change/image-frontend": "^0.8.33",
+    "@live-change/locale-settings-service": "^0.8.33",
+    "@live-change/password-authentication-service": "^0.8.33",
+    "@live-change/prosemirror-service": "^0.8.33",
+    "@live-change/secret-code-service": "^0.8.33",
+    "@live-change/secret-link-service": "^0.8.33",
+    "@live-change/session-service": "^0.8.33",
+    "@live-change/task-service": "^0.8.33",
+    "@live-change/upload-frontend": "^0.8.33",
+    "@live-change/url-frontend": "^0.8.33",
+    "@live-change/url-service": "^0.8.33",
+    "@live-change/user-frontend": "^0.8.33",
+    "@live-change/user-identification-service": "^0.8.33",
+    "@live-change/user-service": "^0.8.33",
+    "@live-change/vote-service": "^0.8.33",
+    "@live-change/vue3-components": "^0.8.33",
+    "@live-change/vue3-ssr": "^0.8.33",
+    "@live-change/wysiwyg-frontend": "^0.8.33",
     "@vueuse/core": "^10.9.0",
     "codeceptjs-assert": "^0.0.5",
     "compression": "^1.7.4",
@@ -91,7 +91,7 @@
     "vue3-scroll-border": "0.1.6"
   },
   "devDependencies": {
-    "@live-change/codeceptjs-helper": "^0.8.32",
+    "@live-change/codeceptjs-helper": "^0.8.33",
     "codeceptjs": "^3.5.12",
     "generate-password": "1.7.1",
     "playwright": "^1.41.2",
@@ -102,5 +102,5 @@
   "author": "Michał Łaszczewski <michal@laszczewski.pl>",
   "license": "ISC",
   "description": "",
-  "gitHead": "9ea7767670a99404794087726223064c45d798d3"
+  "gitHead": "98ff6f9c09e5fc1f408010df6cc8038eff571276"
 }

package/server/testTasks.js

@@ -39,13 +39,20 @@ const getWood = task({
     }
   },
   async execute({ woodType }, { service, task }, emit) {
+    task.progress(0, 1, 'finding tree')
     await sleep(workDuration)
+    if(Math.random() < 0.1) {
+      throw "Getting wood failed"
+    }
+    task.progress(1, 2, 'cutting tree')
+    await sleep(workDuration)
+    task.progress(2, 2, 'done')
     return {
       type: 'Wood',
       woodType
     }
   }
-})
+}, definition)
 
 const cutWood = task({
   name: 'cutWood',
@@ -72,12 +79,13 @@ const cutWood = task({
   },
   async execute({ wood }, { service, task }, emit) {
     await sleep(workDuration)
+    if(Math.random() < 0.1) throw "Wood cutting failed"
     return Array(4).fill(0).map(() => ({
       type: 'Plank',
       woodType: wood.woodType
     }))
   }
-})
+}, definition)
 
 const makePlanks = task({
   name: 'makePlanks',
@@ -98,14 +106,119 @@ const makePlanks = task({
       }
     }
   },
-  async execute({ type }, { service, task }, emit) {
-    const wood = await workerQueue.add(task.run(getWood, { type }))
+  async execute({ woodType }, { service, task }, emit) {
+    task.progress(0, 4, 'getting wood')
+    const wood = await workerQueue.add(() => task.run(getWood, { woodType, to: task.id }))
+    task.progress(1, 4, 'waiting')
     await sleep(pauseDuration)
-    const planks = await workerQueue.add(task.run(cutWood, { wood }))
+    task.progress(2, 4, 'cutting wood')
+    const planks = await workerQueue.add(() => task.run(cutWood, { wood, to: task.id }))
+    task.progress(3, 4, 'waiting')
     await sleep(pauseDuration)
+    task.progress(4, 4, 'done')
     return planks
   }
-})
+}, definition)
+
+const placePlank = task({
+  name: 'placePlank',
+  properties: {
+    plank: {
+      type: 'Plank'
+    },
+    to: {
+      type: String
+    },
+    index: {
+      type: Number
+    }
+  },
+  async execute({ plank, to, index }, { service, task }, emit) {
+    await sleep(workDuration)
+    return {
+      type: 'placedPlank',
+      plank, index
+    }
+  }
+}, definition)
+
+const buildWall = task({
+  name: 'buildWall',
+  properties: {
+    planks: {
+      type: Array,
+      of: {
+        type: 'Plank'
+      }
+    },
+    wallSize: {
+      type: Number
+    }
+  },
+  returns: {
+    type: 'Wall',
+    properties: {
+      size: {
+        type: Number
+      }
+    }
+  },
+  async execute({ planks, wallSize }, { service, task }, emit) {
+    task.progress(0, 2 + wallSize, 'planning')
+    await sleep(pauseDuration)
+    let plankCounter = 0
+    task.progress(1 + plankCounter, 2 + wallSize, 'building')
+    await Promise.all(planks.map((plank, index) => workerQueue.add(
+      async () => {
+        const result = await task.run(placePlank, { plank, to: task.id, index })
+        plankCounter ++
+        task.progress(1 + plankCounter, 2 + wallSize, 'building')
+        return result
+      }
+    )))
+    task.progress(1 + plankCounter, 2 + wallSize, 'waiting')
+    await sleep(pauseDuration)
+    task.progress(2 + plankCounter, 2 + wallSize, 'done')
+    return {
+      type: 'Wall',
+      size: wallSize
+    }
+  }
+}, definition)
+
+const buildRoof = task({
+  name: 'buildRoof',
+  properties: {
+    planks: {
+      type: Array,
+      of: {
+        type: 'Plank'
+      }
+    },
+    roofSize: {
+      type: Number
+    }
+  },
+  returns: {
+    type: 'Roof',
+    properties: {
+      size: {
+        type: Number
+      }
+    }
+  },
+  async execute({ planks, roofSize }, { service, task }, emit) {
+    await sleep(pauseDuration)
+    await Promise.all(planks.map((plank, index) => workerQueue.add(
+      () => task.run(placePlank, { plank, to: task.id, index })
+    )))
+    await sleep(pauseDuration)
+    return {
+      type: 'Roof',
+      size: roofSize
+    }
+  }
+}, definition)
 
 const buildShelter = task({
   name: "buildShelter",
@@ -147,51 +260,58 @@ const buildShelter = task({
     // compute roof size
     const roofSize = width * length
     // compute total plank blocks amount
-    const howManyPlanks = wall1Size * 2 + wall2Size * 2 + roof
+    const howManyPlanks = wall1Size * 2 + wall2Size * 2 + roofSize
 
     let planksCounter = 0
-    task.progress(planksCounter, howManyPlanks)
+    task.progress(planksCounter, howManyPlanks * 2, 'gathering materials')
     // gather planks
     const planks = await Promise.all( // do planks in parallel
       Array(howManyPlanks / 4)
         .fill(0)
         .map(
-          () => workerQueue.add(async () => {
-            const planks = await task.run(makePlanks, { woodType })
+          async (v, index) => {
+            const planks = await task.run(makePlanks, { woodType, to: task.id, index })
             planksCounter += 4
-            task.progress(planksCounter, howManyPlanks)
+            await task.progress(planksCounter, howManyPlanks * 2)
             return planks
-          })
+          }
         )
     )
 
+    task.progress(planksCounter, howManyPlanks * 2, 'waiting')
     await sleep(pauseDuration)
+    task.progress(planksCounter, howManyPlanks * 2, 'building walls')
 
-    let placedPlanks = 0
     // build walls
     const walls = await Promise.all( // do walls in parallel
-      [wall1, wall2, wall1, wall2].map(
+      [wall1Size, wall2Size, wall1Size, wall2Size].map(
         async (wallSize) => {
-          const wall = await workerQueue.add(task.run(buildWall, { planks, wallSize }))
-          placedPlanks += wallSize
-          task.progress(planksCounter, howManyPlanks)
+          const wall = await task.run(buildWall, { planks, wallSize })
+          planksCounter += wallSize
+          await task.progress(planksCounter, howManyPlanks * 2)
           return wall
         }
       )
     )
-    
+
+    task.progress(planksCounter, howManyPlanks * 2, 'waiting')
     await sleep(pauseDuration)
+    task.progress(planksCounter, howManyPlanks * 2, 'building roof')
 
     // build roof
-    const roof = await workerQueue.add(
-      async () => {
-        const roof = await task.run(buildRoof, { planks })
-        placedPlanks += roofSize
+    const roof =
+      await (async () => {
+        const roof = await task.run(buildRoof, { planks, roofSize })
+        planksCounter += roofSize
+        await task.progress(planksCounter, howManyPlanks * 2)
         return roof
-      }
-    )
-    
+      })()
+
+    console.log("ROOF", roof)
+
+    task.progress(planksCounter, howManyPlanks * 2, 'waiting')
     await sleep(pauseDuration)
+    task.progress(planksCounter, howManyPlanks * 2, 'done')
 
     return {
       type: 'Shelter',
@@ -199,7 +319,7 @@ const buildShelter = task({
       roof
     }
   }
-})
+}, definition)
 
 definition.action({
   name: "buildShelter",
@@ -235,8 +355,7 @@ definition.action({
     }
   },
   async execute({ size, woodType, place }, { service, client, command }, emit) {
-    await buildShelter.start({ size, woodType, place }, 'userAction', command.id)
-
+    return await buildShelter.start({ size, woodType, place }, 'userAction', command.id)
   }
 })
 
@@ -271,7 +390,6 @@ const Shelter = definition.model({
 
 definition.trigger({
   name: 'taskBuildShelterDone',
-}, {
   properties: {
     shelter: {
       type: 'Shelter'
@@ -284,5 +402,21 @@ definition.trigger({
   }
 })
 
+definition.view({
+  name: 'shelters',
+  properties: {
+    ...App.rangeProperties
+  },
+  returns: {
+    type: Array,
+    of: {
+      type: 'Shelter'
+    }
+  },
+  async daoPath(range) {
+    return Shelter.rangePath(range)
+  }
+})
+
 
 export default definition