update profiles, and now add tree meta document

holochain-apps · Dec 5, 2023 · f19c2ab · f19c2ab
1 parent 3548c2b
commit f19c2ab
Show file tree

Hide file tree

Showing 11 changed files with 648 additions and 149 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -16,13 +16,12 @@
     "@open-wc/scoped-elements": "^2.1.4",
     "@shoelace-style/shoelace": "^2.5.2",
     "@fortawesome/free-solid-svg-icons": "^6.3.0",
-    "@holochain-open-dev/elements": "^0.7.0",
-    "@holochain-open-dev/profiles": "^0.16.0",
-    "@holochain-open-dev/file-storage": "^0.6.1",
-    "@holochain-open-dev/stores": "^0.6.0",
-    "@holochain-open-dev/utils": "^0.15.0",
-    "@holochain/client": "^0.16",
-    "@lightningrodlabs/we-applet": "0.9.0",
+    "@holochain-open-dev/elements": "^0.8.4",
+    "@holochain-open-dev/profiles": "^0.17.3",
+    "@holochain-open-dev/stores": "^0.8.3",
+    "@holochain-open-dev/utils": "^0.16.0",
+    "@holochain/client": "0.16",
+    "@lightningrodlabs/we-applet": "0.11.0",
     "@lit-labs/context": "^0.2.0",
     "@lit/localize": "^0.11.4",
     "lit": "^2.7.0",

diff --git a/ui/src/elements/how-agent-list.ts b/ui/src/elements/how-agent-list.ts
@@ -36,8 +36,11 @@ export class HowAgentList extends LitElement {
     const agentsHTML: Array<TemplateResult>= []
     for (const agentHash of this.agents) {
       let profile: Profile |undefined = undefined
-      if (this._allProfiles.value.status == "complete")
-      profile = this._allProfiles.value.value.get(decodeHashFromBase64(agentHash))
+      if (this._allProfiles.value.status == "complete") {
+        const record = this._allProfiles.value.value.get(decodeHashFromBase64(agentHash))
+        if (record)
+          profile = record.entry
+      }
 
       if (profile) {
         agentsHTML.push(html`<div class="agent" title="${agentHash}"><agent-avatar agent-pub-key=${agentHash}> </agent-avatar> ${profile.nickname}</div>`)

diff --git a/ui/src/elements/how-controller.ts b/ui/src/elements/how-controller.ts
@@ -13,7 +13,7 @@ import { initialTreeSimple } from "../initSimple";
 import { HowUnitDialog } from "./how-unit-dialog";
 import { ScopedElementsMixin } from "@open-wc/scoped-elements";
 import {HowDocument } from "./how-document";
-import { AsyncStatus, StoreSubscriber } from '@holochain-open-dev/stores';
+import { AsyncReadable, AsyncStatus, StoreSubscriber } from '@holochain-open-dev/stores';
 import { aliveImage } from "../images";
 import '@shoelace-style/shoelace/dist/components/dialog/dialog.js';
 import '@shoelace-style/shoelace/dist/components/button/button.js';
@@ -34,6 +34,7 @@ import {
 import {EntryHashB64, encodeHashToBase64} from "@holochain/client";
 import { consume } from '@lit-labs/context';
 import { HowMyProfileDialog } from "./how-my-profile-dialog";
+import { EntryRecord } from "@holochain-open-dev/utils";
 //import { HowSettings } from "./how-settings";
 //import './how-settings.js';
 
@@ -58,7 +59,7 @@ export class HowController extends ScopedElementsMixin(LitElement) {
   _profiles!: ProfilesStore;
 
 
-  _myProfile!: StoreSubscriber<AsyncStatus<Profile | undefined>>;
+  _myProfile!: StoreSubscriber<AsyncStatus<EntryRecord<Profile> | undefined>>;
   @query("how-my-profile")
   _myProfileDialog!:HowMyProfileDialog
 
@@ -114,15 +115,15 @@ export class HowController extends ScopedElementsMixin(LitElement) {
     if (this._myProfile.value.status == "complete") {
       const profile = this._myProfile.value.value;
       if (profile)
-        return profile.nickname
+        return profile.entry.nickname
     }
     return ""
   }
   get myAvatar(): string {
     if (this._myProfile.value.status == "complete") {
       const profile = this._myProfile.value.value;
       if (profile)
-        return profile.fields.avatar
+        return profile.entry.fields.avatar
     }
     return ""
   }

diff --git a/ui/src/elements/how-tree.ts b/ui/src/elements/how-tree.ts
@@ -51,16 +51,16 @@ export class HowTree extends ScopedElementsMixin(LitElement) {
   buildTree(node: Node):any {
     const unitInfo = this.getUnitInfo(node)
     const nodeId = unitInfo ? encodeHashToBase64(unitInfo.hash) : node.id
-    //const documentsMap = this._documents.value
-    //const docs = node.val.documents.map(hash => documentsMap[encodeHashToBase64(hash)])
+    const documentsMap = this._documents.value
+   // const docs = node.val.documents.map(hash => documentsMap[encodeHashToBase64(hash)])
     const state = node.val.units.length ? node.val.units[0].state : ""// docs[docs.length-1]? docs[docs.length-1].state : ""
     return html`
     <li class="${this.treeType}">
       <span class="${nodeId == this.currentNode ? "current" : ""}" @click=${()=>this.select(nodeId)}>
         <div class="progress" title=${`document count: ${node.val.documents.length}`}>
           <how-node .unit=${this._units.value[nodeId]} state=${state}> </how-node>
         </div>
-        ${node.id=="0" ? "Holochain Community Standards" : node.val.name}
+        ${node.id=="0" ? this._store.treeName : node.val.name}
         <!-- <mwc-button icon="add_circle" @click=${
           () => this.dispatchEvent(new CustomEvent('add-child', { detail: nodeId, bubbles: true, composed: true }))}>
           </mwc-button> -->

diff --git a/ui/src/elements/how-unit.ts b/ui/src/elements/how-unit.ts
@@ -134,8 +134,12 @@ export class HowUnit extends ScopedElementsMixin(LitElement) {
     const created = new Date(action.timestamp)
     const creatorHash = encodeHashToBase64(action.author)
     let creator: Profile |undefined = undefined
-    if (this._allProfiles.value.status == "complete")
-      creator = this._allProfiles.value.value.get(action.author)
+    if (this._allProfiles.value.status == "complete") {
+      const record = this._allProfiles.value.value.get(action.author)
+      if (record) {
+        creator = record.entry
+      }
+    }
     let stateHTML
     let controlsHTML:any[] = []
 

diff --git a/ui/src/holochain-app.ts b/ui/src/holochain-app.ts
@@ -72,8 +72,6 @@ export class HolochainApp extends ScopedElementsMixin(LitElement) {
       const appAgentClient = await AppAgentWebsocket.connect(new URL(url), appId)
 
       this._howStore = new HowStore(appAgentClient, "how")
-
-
 
       this._profilesStore = new ProfilesStore(
         new ProfilesClient(appAgentClient, 'how'), config
@@ -90,10 +88,12 @@ export class HolochainApp extends ScopedElementsMixin(LitElement) {
         const client = weClient.renderInfo.appletClient;
         this._howStore = new HowStore(client, "how")
 
+
         //@ts-ignore
         const profilesClient = weClient.renderInfo.profilesClient;
         this._profilesStore = new ProfilesStore(profilesClient, config)
       }
+      this._howStore.initialize()
 
     this.loaded = true;
   }

diff --git a/ui/src/how.store.ts b/ui/src/how.store.ts
@@ -42,6 +42,8 @@ export class HowStore {
 
   /** Static info */
   myAgentPubKey: AgentPubKeyB64;
+  treeName: string = ""
+  config = {}
 
   /** Readable stores */
   public units: Readable<Dictionary<Unit>> = derived(this.unitsStore, i => i)
@@ -74,7 +76,7 @@ export class HowStore {
     this.service = new HowService(client, roleName, zomeName);
 
     client.on( 'signal', signal => {
-      console.log("SIGNAL",signal)
+      console.log("SIGNAL",signal.payload)
       const payload  = signal.payload as HowSignal
       switch(payload.message.type) {
       case "NewUnit":
@@ -139,7 +141,9 @@ export class HowStore {
       return units
     })
     this.unitsActionStore.update(units => {
-      units[hash] = record.action
+      const a = record.action
+      //@ts-ignore
+      units[hash] = a
       return units
     })
     this.unitsInfoStore.update(units => {
@@ -203,6 +207,15 @@ export class HowStore {
       }
     }
   }
+
+  async initialize() {
+    const docs = await this.pullDocuments("")
+    const meta = docs.find(d=>d.content.documentType == DocType.TreeMeta)
+    if (meta) {
+      this.treeName = meta.content.content[0].name
+      this.config = JSON.parse(meta.content.content[0].content)
+    }
+  }
 
   async pullDocuments(path: string) : Promise<Array<DocumentOutput>> {
     let documents = await this.service.getDocuments(path)

diff --git a/ui/src/initHolochain.ts b/ui/src/initHolochain.ts
@@ -158,6 +158,21 @@ export function initialTreeHolochain(progenitor: AgentPubKeyB64) {
         })],
     ],
     documents: [
+        {
+          path: "",
+          documentType: DocType.TreeMeta,
+          content: [
+            {
+              name: "Holochain Community Standards",
+              sourcePath: SourceManual,
+              sectionType: SectionType.Content,
+              contentType: "text/plain",
+              content: '{"foo":"bar"}',
+            },
+          ],
+          editors: [progenitor],
+          meta: {}
+      },
       {
           path: "",
           documentType: DocType.Document,

diff --git a/ui/src/initSimple.ts b/ui/src/initSimple.ts
@@ -126,6 +126,21 @@ export function initialTreeSimple(progenitor: AgentPubKeyB64) {
         })],
     ],
     documents: [
+        {
+          path: "",
+          documentType: DocType.TreeMeta,
+          content: [
+            {
+              name: "Alignments",
+              sourcePath: SourceManual,
+              sectionType: SectionType.Content,
+              contentType: "text/plain",
+              content: '{"foo":"bar"}',
+            },
+          ],
+          editors: [progenitor],
+          meta: {}
+      },
       {
           path: "",
           documentType: DocType.Document,

diff --git a/ui/src/types.ts b/ui/src/types.ts
@@ -80,6 +80,7 @@ export enum VersioningType {
 }
 
 export enum DocType {
+  TreeMeta = "_",
   Document = "_document",
   Comment = "_comment"
 }