combine dnas ontop of hc_03

Carbon-Farm-Network · Apr 5, 2024 · 5dc285e · 5dc285e
1 parent 1095598
commit 5dc285e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 101 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/ui/package.json b/ui/package.json
@@ -20,8 +20,8 @@
     "@tailwindcss/forms": "^0.5.3",
     "@vaadin/date-time-picker": "^23.3.13",
     "@valueflows/vf-graphql": "^0.9.0-alpha.9",
-    "@leosprograms/graphql-client-holochain": "^0.1.2",
-    "@leosprograms/vf-graphql-holochain": "^0.1.2",
+    "@leosprograms/graphql-client-holochain": "^0.1.3",
+    "@leosprograms/vf-graphql-holochain": "^0.1.3",
     "date-picker-svelte": "^2.4.3",
     "dayjs": "^1.11.9",
     "graphql": "^15.8.0",

diff --git a/ui/src/lib/PlanModal.svelte b/ui/src/lib/PlanModal.svelte
@@ -32,6 +32,8 @@
   // let name = ''
   // let note = ''
 
+  $: commitmentsSavedCount;
+
   const dispatch = createEventDispatcher();
 
   function checkKey(e: any) {
@@ -599,7 +601,9 @@
     }
 
     savingPlan = false;
-    goto(`/plans/update/${p.data.res.plan.id}`)
+    // goto(`/plans/update/${p.data.res.plan.id}`)
+    console.log("Go To Plan Update Page", encodeURIComponent(p.data.res.plan.id))
+    goto(`/plans/update/${encodeURIComponent(p.data.res.plan.id)}`)
 
 
 

diff --git a/ui/src/routes/plans/+page.svelte b/ui/src/routes/plans/+page.svelte
@@ -126,7 +126,7 @@
                   class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-3"
                 >
                   <button type="button" class="text-indigo-600 hover:text-indigo-900"
-                  on:click={() => goto(`plans/update/${plan.node.id}`)}  
+                  on:click={() => goto(`plans/update/${encodeURIComponent(plan.node.id)}`)}  
                   >Edit<span class="sr-only">, {name}</span></button
                   >
                   &nbsp;

diff --git a/workdir/happ.yaml b/workdir/happ.yaml
@@ -18,96 +18,12 @@ roles:
       version: ~
       clone_limit: 0
 
-  - name: hrea_observation_0
+  - name: hrea_combined_0
     provisioning:
       strategy: create
       deferred: false
     dna:
-      bundled: "./hrea_observation.dna"
-      modifiers:
-        network_seed: ~
-        properties: ~
-        origin_time: ~
-        quantum_time: ~
-      version: ~
-      clone_limit: 0
-
-  - name: hrea_specification_0
-    provisioning:
-      strategy: create
-      deferred: false
-    dna:
-      bundled: "./hrea_specification.dna"
-      modifiers:
-        network_seed: ~
-        properties: ~
-        origin_time: ~
-        quantum_time: ~
-      version: ~
-      clone_limit: 0
-
-  - name: hrea_agent_0
-    provisioning:
-      strategy: create
-      deferred: false
-    dna:
-      bundled: "./hrea_agent.dna"
-      modifiers:
-        network_seed: ~
-        properties: ~
-        origin_time: ~
-        quantum_time: ~
-      version: ~
-      clone_limit: 0
-
-  - name: hrea_planning_0
-    provisioning:
-      strategy: create
-      deferred: false
-    dna:
-      bundled: "./hrea_planning.dna"
-      modifiers:
-        network_seed: ~
-        properties: ~
-        origin_time: ~
-        quantum_time: ~
-      version: ~
-      clone_limit: 0
-
-  - name: hrea_proposal_0
-    provisioning:
-      strategy: create
-      deferred: false
-    dna:
-      bundled: "./hrea_proposal.dna"
-      modifiers:
-        network_seed: ~
-        properties: ~
-        origin_time: ~
-        quantum_time: ~
-      version: ~
-      clone_limit: 0
-
-  - name: hrea_plan_0
-    provisioning:
-      strategy: create
-      deferred: false
-    dna:
-      bundled: "./hrea_plan.dna"
-      modifiers:
-        network_seed: ~
-        properties: ~
-        origin_time: ~
-        quantum_time: ~
-      version: ~
-      clone_limit: 0
-
-  - name: hrea_agreement_0
-    provisioning:
-      strategy: create
-      deferred: false
-    dna:
-      bundled: "./hrea_agreement.dna"
+      bundled: "./hrea_combined.dna"
       modifiers:
         network_seed: ~
         properties: ~