@powerhousedao/network-admin 0.0.46 → 0.0.47

package/dist/processors/workstreams/factory.js

@@ -11,7 +11,7 @@ export const workstreamsProcessorFactory = (module) => async (driveHeader) => {
     const filter = {
         branch: ["main"],
         documentId: ["*"],
-        documentType: ["powerhouse/workstream"],
+        documentType: ["powerhouse/workstream", "powerhouse/document-drive"],
         scope: ["global"],
     };
     // Create the processor

package/dist/processors/workstreams/index.d.ts

@@ -3,6 +3,7 @@ import type { InternalTransmitterUpdate, InternalOperationUpdate } from "documen
 import type { DB } from "./schema.js";
 export declare class WorkstreamsProcessor extends RelationalDbProcessor<DB> {
     static getNamespace(driveId: string): string;
+    workstreams: string[];
     initAndUpgrade(): Promise<void>;
     onStrands(strands: InternalTransmitterUpdate[]): Promise<void>;
     onDisconnect(): Promise<void>;

package/dist/processors/workstreams/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../processors/workstreams/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAE,yBAAyB,EAAE,uBAAuB,EAAG,MAAM,gBAAgB,CAAC;AAG1F,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEtC,qBAAa,oBAAqB,SAAQ,qBAAqB,CAAC,EAAE,CAAC;WACjD,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAKtC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B,SAAS,CACtB,OAAO,EAAE,yBAAyB,EAAE,GACnC,OAAO,CAAC,IAAI,CAAC;IAyBV,YAAY;IAelB,aAAa,GAAU,QAAQ,yBAAyB,mBA8BvD;IAED,iCAAiC,GAAU,QAAQ,yBAAyB,EAAE,WAAW,uBAAuB,mBA2C/G;IAED,yBAAyB,GAAU,QAAQ,yBAAyB,EAAE,WAAW,uBAAuB,mBAwCvG;IAED,gBAAgB,GAAU,QAAQ,yBAAyB,EAAE,WAAW,uBAAuB,mBAyC9F;CACF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../processors/workstreams/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAE,yBAAyB,EAAE,uBAAuB,EAAqB,MAAM,gBAAgB,CAAC;AAG5G,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEtC,qBAAa,oBAAqB,SAAQ,qBAAqB,CAAC,EAAE,CAAC;WACjD,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAKrD,WAAW,EAAE,MAAM,EAAE,CAAK;IAEX,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B,SAAS,CACtB,OAAO,EAAE,yBAAyB,EAAE,GACnC,OAAO,CAAC,IAAI,CAAC;IAoCV,YAAY;IAelB,aAAa,GAAU,QAAQ,yBAAyB,mBA+BvD;IAED,iCAAiC,GAAU,QAAQ,yBAAyB,EAAE,WAAW,uBAAuB,mBA6C/G;IAED,yBAAyB,GAAU,QAAQ,yBAAyB,EAAE,WAAW,uBAAuB,mBAwCvG;IAED,gBAAgB,GAAU,QAAQ,yBAAyB,EAAE,WAAW,uBAAuB,mBAyC9F;CACF"}

package/dist/processors/workstreams/index.js

@@ -5,6 +5,7 @@ export class WorkstreamsProcessor extends RelationalDbProcessor {
         // Default namespace: `${this.name}_${driveId.replaceAll("-", "_")}`
         return super.getNamespace(driveId);
     }
+    workstreams = [];
     async initAndUpgrade() {
         await up(this.relationalDb);
     }
@@ -19,13 +20,23 @@ export class WorkstreamsProcessor extends RelationalDbProcessor {
             if (strand.documentType === "powerhouse/workstream") {
                 this.setWorkstream(strand);
             }
-            // console.log("strand", { documentType: strand.documentType, docId: strand.documentId, state: strand.state });
+            // console.log("strand", { documentType: strand.documentType, docId: strand.documentId });
             for (const operation of strand.operations) {
                 if (strand.documentType === "powerhouse/workstream") {
                     this.updateWorkstream(strand, operation);
                     this.updateNetworkInWorkstream(strand, operation);
                     this.updateInitialProposalInWorkstream(strand, operation);
                 }
+                if (strand.documentType === "powerhouse/document-drive") {
+                    if (operation.action.type === "DELETE_NODE") {
+                        const castAction = operation.action;
+                        console.log("deleting workstream node", (castAction.input.id));
+                        const foundWorkstream = this.workstreams.find(ws => ws === castAction.input.id);
+                        if (foundWorkstream) {
+                            await this.relationalDb.deleteFrom("workstreams").where("workstream_phid", "=", foundWorkstream).execute();
+                        }
+                    }
+                }
             }
         }
     }
@@ -54,21 +65,22 @@ export class WorkstreamsProcessor extends RelationalDbProcessor {
         console.log("existingWorkstreamPhids", existingWorkstreamPhids);
         if (existingWorkstreamPhids.length === 0) {
             console.log('No workstream id found, inserting new one', docId);
+            this.workstreams.push(docId);
             // insert network id
             await this.relationalDb
                 .insertInto("workstreams")
                 .values({
-                // network_phid: strand.state.client.id,
-                // network_slug: strand.state.client.name.toLowerCase().split(' ').join("-"),
+                network_phid: strand.state.client.id,
+                network_slug: strand.state.client.name ? strand.state.client.name.toLowerCase().split(' ').join("-") : null,
                 workstream_phid: strand.documentId,
                 workstream_slug: strand.state.title ? strand.state.title.toLowerCase().split(' ').join("-") : "",
                 workstream_title: strand.state.title,
                 workstream_status: strand.state.status,
-                // sow_phid: strand.state.sow,
+                sow_phid: strand.state.initialProposal ? strand.state.initialProposal.sow : null,
                 // roadmap_oid: "which roadmmap Id ? there's many roadmaps in a sow doc",
                 // final_milestone_target: new Date(),
-                // initial_proposal_status: strand.state.initialProposal.status,
-                // initial_proposal_author: strand.state.initialProposal.author.name
+                initial_proposal_status: strand.state.initialProposal ? strand.state.initialProposal.status : null,
+                initial_proposal_author: strand.state.initialProposal ? strand.state.initialProposal.author.name : null
             })
                 .onConflict((oc) => oc.column("workstream_phid").doNothing())
                 .execute();
@@ -93,9 +105,11 @@ export class WorkstreamsProcessor extends RelationalDbProcessor {
                 const updateData = {};
                 if (input.sowId) {
                     updateData.sow_phid = input.sowId;
+                    updateData.initial_proposal_status = "DRAFT";
                 }
                 if (input.proposalAuthor) {
                     updateData.initial_proposal_author = input.proposalAuthor.name;
+                    updateData.initial_proposal_status = "DRAFT";
                 }
                 if (input.status) {
                     updateData.initial_proposal_status = input.status;

package/dist/subgraphs/networks/resolvers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../../../subgraphs/networks/resolvers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAK/D,eAAO,MAAM,YAAY,GAAI,UAAU,YAAY,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CA8H3E,CAAC"}
+{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../../../subgraphs/networks/resolvers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAK/D,eAAO,MAAM,YAAY,GAAI,UAAU,YAAY,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAyI3E,CAAC"}

package/dist/subgraphs/networks/resolvers.js

@@ -3,7 +3,7 @@ export const getResolvers = (subgraph) => {
     const reactor = subgraph.reactor;
     return {
         Query: {
-            allNetworks: async () => {
+            allNetworks: async (_, args) => {
                 const drives = await reactor.getDrives();
                 // Step 1: Collect all network profile documents and builders documents with their drive IDs
                 const networkDocsWithDriveId = [];
@@ -63,13 +63,13 @@ export const getResolvers = (subgraph) => {
                     const state = doc.state.global;
                     return {
                         id: doc.header.id,
-                        name: state?.name || doc.header.id,
+                        name: state?.name || doc.header.name,
                         icon: state?.icon || "",
                         description: state?.description || state?.slug || "",
                     };
                 };
                 // Step 6: Map each network to its builders from the same drive
-                return networkDocsWithDriveId.map(({ doc, driveId }) => {
+                const allNetworks = networkDocsWithDriveId.map(({ doc, driveId }) => {
                     const state = doc.state.global;
                     // Get the BuildersDocument from the same drive as the network
                     const buildersDoc = driveIdToBuildersDoc.get(driveId);
@@ -84,6 +84,7 @@ export const getResolvers = (subgraph) => {
                         documentType: doc.header.documentType,
                         network: {
                             name: state.name,
+                            slug: state.name ? state.name.toLowerCase().trim().split(/\s+/).join("-") : null,
                             icon: state.icon,
                             darkThemeIcon: state.darkThemeIcon ?? null,
                             logo: state.logo,
@@ -100,6 +101,12 @@ export const getResolvers = (subgraph) => {
                         builders: builders,
                     };
                 });
+                // Step 7: Apply filter if provided
+                const networkSlug = args.filter?.networkSlug;
+                if (networkSlug) {
+                    return allNetworks.filter((network) => network.network.slug === networkSlug);
+                }
+                return allNetworks;
             },
         },
     };

package/dist/subgraphs/networks/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../subgraphs/networks/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,eAAO,MAAM,MAAM,EAAE,YA+CpB,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../subgraphs/networks/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,eAAO,MAAM,MAAM,EAAE,YAmDpB,CAAC"}

package/dist/subgraphs/networks/schema.js

@@ -4,9 +4,12 @@ export const schema = gql `
   Subgraph definition
   """
   type Query {
-    allNetworks: [AllNetworks!]!
+    allNetworks(filter: networkFilter): [AllNetworks!]!
   }
 
+  input networkFilter {
+    networkSlug: String
+  }
 
   type AllNetworks {
     id: PHID
@@ -17,6 +20,7 @@ export const schema = gql `
 
   type Network {
     name: String!
+    slug: String
     icon: String!
     darkThemeIcon: String!
     logo: String!

package/dist/subgraphs/workstreams/resolvers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../../../subgraphs/workstreams/resolvers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAmC5D,eAAO,MAAM,YAAY,GAAI,UAAU,SAAS,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAqdxE,CAAC"}
+{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../../../subgraphs/workstreams/resolvers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAwC5D,eAAO,MAAM,YAAY,GAAI,UAAU,SAAS,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAmhBxE,CAAC"}

package/dist/subgraphs/workstreams/resolvers.js

@@ -2,6 +2,7 @@ import {} from "@powerhousedao/reactor-api";
 import { WorkstreamsProcessor } from "../../processors/workstreams/index.js";
 import {} from "../../document-models/request-for-proposals/index.js";
 import {} from "../../document-models/workstream/index.js";
+import { sql } from "kysely";
 export const getResolvers = (subgraph) => {
     const reactor = subgraph.reactor;
     const db = subgraph.relationalDb;
@@ -65,6 +66,34 @@ export const getResolvers = (subgraph) => {
             };
         }
     };
+    const loadNetworkProfile = async (networkId) => {
+        if (!networkId) {
+            return null;
+        }
+        try {
+            const networkDoc = await reactor.getDocument(networkId);
+            const state = networkDoc.state.global;
+            return {
+                name: state.name || "",
+                slug: state.name ? state.name.toLowerCase().trim().split(/\s+/).join("-") : null,
+                icon: state.icon || "",
+                darkThemeIcon: state.darkThemeIcon || "",
+                logo: state.logo || "",
+                darkThemeLogo: state.darkThemeLogo || "",
+                logoBig: state.logoBig || "",
+                website: state.website ?? null,
+                description: state.description || "",
+                category: state.category || [],
+                x: state.x ?? null,
+                github: state.github ?? null,
+                discord: state.discord ?? null,
+                youtube: state.youtube ?? null,
+            };
+        }
+        catch {
+            return null;
+        }
+    };
     const hydrateWorkstreamRow = async (row) => {
         try {
             const doc = await reactor.getDocument(row.workstream_phid);
@@ -81,7 +110,7 @@ export const getResolvers = (subgraph) => {
                 status: p.status,
                 author: p.author,
             }));
-            const [topSowDoc, topPaymentTermsDoc, initialSowDoc, initialPaymentTermsDoc, altSowDocs, altPaymentDocs, rfpDetails,] = await Promise.all([
+            const [topSowDoc, topPaymentTermsDoc, initialSowDoc, initialPaymentTermsDoc, altSowDocs, altPaymentDocs, rfpDetails, networkInfo,] = await Promise.all([
                 loadLinkedDocument(state.sow || row.sow_phid || null),
                 loadLinkedDocument(state.paymentTerms || null),
                 loadLinkedDocument(state.initialProposal?.sow || row.sow_phid || null),
@@ -89,6 +118,7 @@ export const getResolvers = (subgraph) => {
                 Promise.all((state.alternativeProposals || []).map((p) => loadLinkedDocument(p.sow || null))),
                 Promise.all((state.alternativeProposals || []).map((p) => loadLinkedDocument(p.paymentTerms || null))),
                 loadRfpDetails(state.rfp || null),
+                loadNetworkProfile(state.client?.id || row.network_phid || null),
             ]);
             const client = state.client ??
                 (row.network_phid
@@ -97,8 +127,10 @@ export const getResolvers = (subgraph) => {
             return {
                 code: state.code || null,
                 title: state.title || row.workstream_title || null,
+                slug: state.title ? state.title.toLowerCase().trim().split(/\s+/).join("-") : null,
                 status: state.status || row.workstream_status || null,
                 client,
+                network: networkInfo || {},
                 rfp: rfpDetails,
                 initialProposal: initialProposalBase
                     ? {
@@ -118,13 +150,16 @@ export const getResolvers = (subgraph) => {
             };
         }
         catch {
+            const networkInfo = await loadNetworkProfile(row.network_phid || null);
             return {
                 code: row.workstream_title || null,
                 title: row.workstream_title || null,
+                slug: row.workstream_slug || null,
                 status: row.workstream_status || null,
                 client: row.network_phid
                     ? { id: row.network_phid, name: row.network_slug, icon: null }
                     : null,
+                network: networkInfo || {},
                 rfp: null,
                 initialProposal: null,
                 alternativeProposals: [],
@@ -135,12 +170,22 @@ export const getResolvers = (subgraph) => {
         }
     };
     const applyWorkstreamFilters = (qb, filters, wantedSlug) => {
-        if (filters.workstreamId) {
+        // Handle workstreamId and workstreamSlug (from WorkstreamFilter)
+        if ("workstreamId" in filters && filters.workstreamId) {
             qb = qb.where("workstream_phid", "=", filters.workstreamId);
         }
-        else if (filters.workstreamSlug) {
+        else if ("workstreamSlug" in filters && filters.workstreamSlug) {
             qb = qb.where("workstream_slug", "=", filters.workstreamSlug);
         }
+        // Handle workstreamTitle filter (from WorkstreamsFilter)
+        if ("workstreamTitle" in filters && filters.workstreamTitle) {
+            // Use case-insensitive partial match for workstream title
+            // Filter out NULL values and do case-insensitive search
+            const searchPattern = `%${filters.workstreamTitle.toLowerCase()}%`;
+            qb = qb
+                .where("workstream_title", "is not", null)
+                .where((eb) => eb(sql `LOWER(workstream_title)`, "like", searchPattern));
+        }
         if (filters.networkId) {
             qb = qb.where("network_phid", "=", filters.networkId);
         }
@@ -150,6 +195,15 @@ export const getResolvers = (subgraph) => {
         else if (filters.networkName && wantedSlug) {
             qb = qb.where("network_slug", "=", wantedSlug);
         }
+        else if ("networkNames" in filters && filters.networkNames) {
+            // Handle networkNames filter (from WorkstreamsFilter)
+            const networkSlugs = filters.networkNames
+                .filter((name) => Boolean(name))
+                .map((name) => deriveSlug(name));
+            if (networkSlugs.length > 0) {
+                qb = qb.where("network_slug", "in", networkSlugs);
+            }
+        }
         const statuses = (filters.workstreamStatuses || []).filter((status) => Boolean(status));
         if (statuses.length > 0) {
             qb = qb.where("workstream_status", "in", statuses);
@@ -211,16 +265,20 @@ export const getResolvers = (subgraph) => {
                 const candidateDrives = await getCandidateDrives();
                 const wantedSlug = filters.networkSlug ||
                     (filters.networkName ? deriveSlug(filters.networkName) : undefined);
-                let resolved = null;
+                let resolved = [];
                 for (const driveId of candidateDrives) {
                     let qb = WorkstreamsProcessor.query(driveId, db)
                         .selectFrom("workstreams")
                         .selectAll();
                     qb = applyWorkstreamFilters(qb, filters, wantedSlug);
-                    const row = await qb.executeTakeFirst();
-                    if (!row)
+                    const rows = await qb.execute();
+                    if (rows.length === 0) {
                         continue;
-                    resolved = await hydrateWorkstreamRow(row);
+                    }
+                    for (const row of rows) {
+                        const hydrated = await hydrateWorkstreamRow(row);
+                        resolved.push(hydrated);
+                    }
                     break;
                 }
                 return resolved;
@@ -232,6 +290,8 @@ export const getResolvers = (subgraph) => {
                 const hasFilters = filters.networkId ||
                     filters.networkSlug ||
                     filters.networkName ||
+                    (filters.networkNames && filters.networkNames.length > 0) ||
+                    filters.workstreamTitle ||
                     filters.workstreamStatus ||
                     (filters.workstreamStatuses &&
                         filters.workstreamStatuses.length > 0);
@@ -244,14 +304,7 @@ export const getResolvers = (subgraph) => {
                         .selectAll();
                     // Only apply filters if any are provided
                     if (hasFilters) {
-                        const filterArgs = {
-                            networkId: filters.networkId,
-                            networkSlug: filters.networkSlug,
-                            networkName: filters.networkName,
-                            workstreamStatus: filters.workstreamStatus,
-                            workstreamStatuses: filters.workstreamStatuses,
-                        };
-                        qb = applyWorkstreamFilters(qb, filterArgs, wantedSlug);
+                        qb = applyWorkstreamFilters(qb, filters, wantedSlug);
                     }
                     const rows = await qb.execute();
                     if (rows.length === 0) {

package/dist/subgraphs/workstreams/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../subgraphs/workstreams/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,eAAO,MAAM,MAAM,EAAE,YAoUpB,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../subgraphs/workstreams/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,eAAO,MAAM,MAAM,EAAE,YAiWpB,CAAC"}

package/dist/subgraphs/workstreams/schema.js

@@ -5,7 +5,7 @@ export const schema = gql `
   """
   type Query {
     processorWorkstreams: [ProcessorWorkstream!]!
-    workstream(filter: WorkstreamFilter!): FullQueryWorkstream
+    workstream(filter: WorkstreamFilter!): [FullQueryWorkstream!]!
     workstreams(filter: WorkstreamsFilter): [FullQueryWorkstream!]!
     rfpByWorkstream(filter: WorkstreamFilter!): [WorkstreamRfp!]!
     scopeOfWorkByNetworkOrStatus(filter: scopeOfWorkByNetworkOrStatusFilter!): [SOW_ScopeOfWorkState!]!
@@ -72,6 +72,8 @@ export const schema = gql `
     networkId: PHID
     networkSlug: String
     networkName: String
+    networkNames: [String!]
+    workstreamTitle: String
     workstreamStatus: WorkstreamStatus
     workstreamStatuses: [WorkstreamStatus!]
   }
@@ -98,8 +100,10 @@ export const schema = gql `
   type FullQueryWorkstream {
     code: String
     title: String
+    slug: String
     status: WorkstreamStatus
     client: ClientInfo
+    network: Network
     rfp: RFP
     initialProposal: FullProposal
     alternativeProposals: [FullProposal!]!
@@ -108,6 +112,31 @@ export const schema = gql `
     paymentRequests: [PHID!]!
   }
 
+  type Network {
+    name: String!
+    slug: String
+    icon: String!
+    darkThemeIcon: String!
+    logo: String!
+    darkThemeLogo: String!
+    logoBig: String!
+    website: String
+    description: String!
+    category: [NetworkCategory!]!
+    x: String
+    github: String
+    discord: String
+    youtube: String
+  }
+
+  enum NetworkCategory {
+    DEFI
+    OSS
+    CRYPTO
+    NGO
+    CHARITY
+  }
+
   type WorkstreamRfp {
     code: String
     title: String

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@powerhousedao/network-admin",
   "description": "Network Admin package for Powerhouse",
-  "version": "0.0.46",
+  "version": "0.0.47",
   "license": "AGPL-3.0-only",
   "type": "module",
   "files": [