@powerhousedao/vetra-builder-package 0.0.20 → 0.0.22

package/dist/processors/vetra-builder-relational-db-processor/builder-team-handlers.js

@@ -41,9 +41,9 @@ export class BuilderTeamHandlers {
             case "UPDATE_SPACE_INFO":
                 await this.handleUpdateSpaceInfo(documentId, action, state);
                 break;
-            // case "REORDER_SPACES":
-            //   await this.handleReorderSpaces(documentId, action, state);
-            //   break;
+            case "REORDER_SPACES":
+                await this.handleReorderSpaces(documentId, action, state);
+                break;
             // Packages operations
             case "ADD_PACKAGE":
                 await this.handleAddPackage(documentId, action, state);
@@ -54,6 +54,9 @@ export class BuilderTeamHandlers {
             case "UPDATE_PACKAGE_INFO":
                 await this.handleUpdatePackageInfo(documentId, action, state);
                 break;
+            case "REORDER_PACKAGES":
+                await this.handleReorderPackages(documentId, action, state);
+                break;
         }
     }
     // Profile operations
@@ -119,6 +122,9 @@ export class BuilderTeamHandlers {
     // Spaces operations
     async handleAddSpace(documentId, action, state) {
         await this.dbHelpers.ensureBuilderAccountExistsAndIsNotdeleted(documentId);
+        // Find the space in state to get its sortOrder
+        const space = state.spaces.find((s) => s.id === action.input.id);
+        const sortOrder = space?.sortOrder ?? 0;
         await this.db
             .insertInto("builder_team_spaces")
             .values({
@@ -126,7 +132,7 @@ export class BuilderTeamHandlers {
             builder_team_id: documentId,
             title: "",
             description: "",
-            sort_order: 0,
+            sort_order: sortOrder,
             created_at: new Date(),
             updated_at: new Date(),
         })
@@ -143,10 +149,10 @@ export class BuilderTeamHandlers {
     async handleUpdateSpaceInfo(documentId, action, state) {
         const updates = {};
         // Only include fields that are provided
-        if (action.input.title !== undefined) {
+        if (action.input.title !== undefined && action.input.title !== null) {
             updates.title = action.input.title;
         }
-        if (action.input.description !== undefined) {
+        if (action.input.description !== undefined && action.input.description !== null) {
             updates.description = action.input.description;
         }
         // Only update if there are actual changes
@@ -154,22 +160,25 @@ export class BuilderTeamHandlers {
             await this.dbHelpers.updateBuilderSpace(action.input.id, documentId, updates);
         }
     }
-    // private async handleReorderSpaces(
-    //   documentId: string,
-    //   action: ReorderSpacesAction,
-    //   state: BuilderAccountState
-    // ): Promise<void> {
-    //   const { ids, insertAfter } = action.input;
-    //   for (let i = 0; i < ids.length; i++) {
-    //     const spaceId = ids[i];
-    //     const sortOrder = insertAfter !== null ? Number(insertAfter) + i + 1 : i;
-    //     await this.dbHelpers.updateBuilderSpace(spaceId, documentId, {
-    //       sort_order: sortOrder,
-    //     });
-    //   }
-    // }
+    async handleReorderSpaces(documentId, action, state) {
+        // Update sortOrder for all spaces based on the state
+        for (const space of state.spaces) {
+            await this.dbHelpers.updateBuilderSpace(space.id, documentId, {
+                sort_order: space.sortOrder,
+            });
+        }
+    }
     // Packages operations
     async handleAddPackage(documentId, action, state) {
+        // Find the package in state to get its sortOrder
+        let sortOrder = 0;
+        for (const space of state.spaces) {
+            const pkg = space.packages.find((p) => p.id === action.input.id);
+            if (pkg) {
+                sortOrder = pkg.sortOrder ?? 0;
+                break;
+            }
+        }
         await this.db
             .insertInto("builder_team_packages")
             .values({
@@ -184,7 +193,7 @@ export class BuilderTeamHandlers {
             npm_url: "",
             vetra_drive_url: "",
             drive_id: "",
-            sort_order: 0,
+            sort_order: sortOrder,
             created_at: new Date(),
             updated_at: new Date(),
         })
@@ -207,51 +216,67 @@ export class BuilderTeamHandlers {
     }
     async handleUpdatePackageInfo(documentId, action, state) {
         const updates = {};
+        // Find the package in the state to get additional information
+        let packageFromState = null;
+        for (const space of state.spaces) {
+            const pkg = space.packages.find((p) => p.id === action.input.id);
+            if (pkg) {
+                packageFromState = pkg;
+                break;
+            }
+        }
         // Map input fields to database columns, only include provided fields
-        if (action.input.title !== undefined) {
+        if (action.input.title !== undefined && action.input.title !== null) {
             updates.title = action.input.title;
         }
-        if (action.input.description !== undefined) {
+        if (action.input.description !== undefined && action.input.description !== null) {
             updates.description = action.input.description;
         }
-        if (action.input.github !== undefined) {
+        if (action.input.github !== undefined && action.input.github !== null) {
             updates.github_url = action.input.github;
         }
-        if (action.input.npm !== undefined) {
+        if (action.input.npm !== undefined && action.input.npm !== null) {
             updates.npm_url = action.input.npm;
         }
-        if (action.input.vetraDriveUrl !== undefined) {
+        if (action.input.vetraDriveUrl !== undefined && action.input.vetraDriveUrl !== null) {
             updates.vetra_drive_url = action.input.vetraDriveUrl;
         }
-        if (action.input.spaceId !== undefined) {
+        if (action.input.spaceId !== undefined && action.input.spaceId !== null) {
             updates.space_id = action.input.spaceId;
         }
-        // Note: phid is not stored in the packages table, and id is the WHERE condition
+        // If we found the package in state and phid is available, store it
+        if (packageFromState?.phid) {
+            updates.drive_id = packageFromState.phid;
+        }
+        else if (action.input.phid) {
+            updates.drive_id = action.input.phid;
+        }
+        // Always update the updated_at timestamp
+        updates.updated_at = new Date();
         // Only update if there are actual changes
         if (Object.keys(updates).length > 0) {
             await this.dbHelpers.updateBuilderPackage(action.input.id, updates);
         }
     }
-    // private async handleReorderPackages(
-    //   documentId: string,
-    //   action: ReorderPackagesAction,
-    //   state: BuilderAccountState
-    // ): Promise<void> {
-    //   const { ids, insertAfter, spaceId } = action.input;
-    //   for (let i = 0; i < ids.length; i++) {
-    //     const packageId = ids[i];
-    //     const sortOrder = insertAfter !== null ? Number(insertAfter) + i + 1 : i;
-    //     await this.db
-    //       .updateTable("builder_packages")
-    //       .set({
-    //         sort_order: sortOrder,
-    //         updated_at: new Date(),
-    //       })
-    //       .where("id", "=", packageId)
-    //       .where("space_id", "=", spaceId)
-    //       .execute();
-    //   }
-    // }
+    async handleReorderPackages(documentId, action, state) {
+        const { spaceId } = action.input;
+        // Find the space in state
+        const space = state.spaces.find((s) => s.id === spaceId);
+        if (!space)
+            return;
+        // Update sortOrder for all packages in the space based on the state
+        for (const pkg of space.packages) {
+            await this.db
+                .updateTable("builder_team_packages")
+                .set({
+                sort_order: pkg.sortOrder,
+                updated_at: new Date(),
+            })
+                .where("id", "=", pkg.id)
+                .where("space_id", "=", spaceId)
+                .execute();
+        }
+    }
     async handleDeletePackage(documentId, action, state) {
         await this.db
             .deleteFrom("builder_team_packages")

package/dist/processors/vetra-builder-relational-db-processor/database-helpers.d.ts

@@ -1,5 +1,6 @@
 import type { IRelationalDb } from "document-drive";
 import type { DB } from "./schema.js";
+import type { Updateable } from "kysely";
 export declare class DatabaseHelpers {
     private db;
     constructor(db: IRelationalDb<DB>);
@@ -19,19 +20,19 @@ export declare class DatabaseHelpers {
     /**
      * Updates a package with the provided data
      */
-    updatePackage(documentId: string, updates: Record<string, any>): Promise<void>;
+    updatePackage(documentId: string, updates: Partial<Updateable<DB["builder_team_packages"]>>): Promise<void>;
     /**
      * Updates a builder account with the provided data
      */
-    updateBuilderAccount(documentId: string, updates: Record<string, any>): Promise<void>;
+    updateBuilderAccount(documentId: string, updates: Partial<Updateable<DB["builder_teams"]>>): Promise<void>;
     /**
      * Updates a builder space with the provided data
      */
-    updateBuilderSpace(spaceId: string, documentId: string, updates: Record<string, any>): Promise<void>;
+    updateBuilderSpace(spaceId: string, documentId: string, updates: Partial<Updateable<DB["builder_team_spaces"]>>): Promise<void>;
     /**
      * Updates a builder package with the provided data
      */
-    updateBuilderPackage(packageId: string, updates: Record<string, any>): Promise<void>;
+    updateBuilderPackage(packageId: string, updates: Partial<Updateable<DB["builder_team_packages"]>>): Promise<void>;
     /**
      * Checks if a member already exists for a builder account
      */

package/dist/processors/vetra-builder-relational-db-processor/factory.js

@@ -13,7 +13,6 @@ export const vetraBuilderTeamRelationalDbProcessorFactory = (module) => async (d
     };
     // Create the processor
     const processor = new VetraBuilderRelationalDbProcessor(namespace, filter, store);
-    console.log("vetraBuilderRelationalDbProcessorFactory", processor);
     return [
         {
             processor,

package/dist/processors/vetra-builder-relational-db-processor/index.js

@@ -22,7 +22,6 @@ export class VetraBuilderRelationalDbProcessor extends RelationalDbProcessor {
             if (strand.operations.length === 0) {
                 continue;
             }
-            console.log("onStrands", strand);
             for (const operation of strand.operations) {
                 if (strand.documentType.includes("powerhouse/document-drive")) {
                     await this.handleDocumentDriveOperation(strand.documentId, strand.driveId, operation.action, operation.state);

package/dist/processors/vetra-builder-relational-db-processor/migrations.d.ts

@@ -1,3 +1,4 @@
 import { type IRelationalDb } from "document-drive/processors/types";
-export declare function up(db: IRelationalDb<any>): Promise<void>;
-export declare function down(db: IRelationalDb<any>): Promise<void>;
+import type { DB } from "./schema.js";
+export declare function up(db: IRelationalDb<DB>): Promise<void>;
+export declare function down(db: IRelationalDb<DB>): Promise<void>;

package/dist/style.css

@@ -284,6 +284,9 @@
   .mt-4 {
     margin-top: calc(var(--spacing) * 4);
   }
+  .mt-6 {
+    margin-top: calc(var(--spacing) * 6);
+  }
   .mb-0\.5 {
     margin-bottom: calc(var(--spacing) * 0.5);
   }
@@ -302,12 +305,21 @@
   .mb-5 {
     margin-bottom: calc(var(--spacing) * 5);
   }
+  .mb-6 {
+    margin-bottom: calc(var(--spacing) * 6);
+  }
   .ml-4 {
     margin-left: calc(var(--spacing) * 4);
   }
   .ml-6 {
     margin-left: calc(var(--spacing) * 6);
   }
+  .line-clamp-2 {
+    overflow: hidden;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+  }
   .block {
     display: block;
   }
@@ -338,9 +350,6 @@
   .h-5 {
     height: calc(var(--spacing) * 5);
   }
-  .h-6 {
-    height: calc(var(--spacing) * 6);
-  }
   .h-8 {
     height: calc(var(--spacing) * 8);
   }
@@ -371,9 +380,6 @@
   .w-5 {
     width: calc(var(--spacing) * 5);
   }
-  .w-6 {
-    width: calc(var(--spacing) * 6);
-  }
   .w-8 {
     width: calc(var(--spacing) * 8);
   }
@@ -389,6 +395,9 @@
   .w-20 {
     width: calc(var(--spacing) * 20);
   }
+  .w-full {
+    width: 100%;
+  }
   .max-w-7xl {
     max-width: var(--container-7xl);
   }
@@ -514,12 +523,18 @@
   .overflow-hidden {
     overflow: hidden;
   }
+  .rounded {
+    border-radius: 0.25rem;
+  }
   .rounded-full {
     border-radius: calc(infinity * 1px);
   }
   .rounded-lg {
     border-radius: var(--radius-lg);
   }
+  .rounded-md {
+    border-radius: var(--radius-md);
+  }
   .rounded-xl {
     border-radius: var(--radius-xl);
   }
@@ -541,6 +556,9 @@
   .border-gray-300 {
     border-color: var(--color-gray-300);
   }
+  .bg-blue-100 {
+    background-color: var(--color-blue-100);
+  }
   .bg-gray-50 {
     background-color: var(--color-gray-50);
   }
@@ -568,6 +586,12 @@
   .p-6 {
     padding: calc(var(--spacing) * 6);
   }
+  .px-2 {
+    padding-inline: calc(var(--spacing) * 2);
+  }
+  .px-2\.5 {
+    padding-inline: calc(var(--spacing) * 2.5);
+  }
   .px-3 {
     padding-inline: calc(var(--spacing) * 3);
   }
@@ -577,15 +601,27 @@
   .px-6 {
     padding-inline: calc(var(--spacing) * 6);
   }
+  .py-0\.5 {
+    padding-block: calc(var(--spacing) * 0.5);
+  }
+  .py-1 {
+    padding-block: calc(var(--spacing) * 1);
+  }
   .py-2 {
     padding-block: calc(var(--spacing) * 2);
   }
+  .py-3 {
+    padding-block: calc(var(--spacing) * 3);
+  }
   .py-4 {
     padding-block: calc(var(--spacing) * 4);
   }
   .py-5 {
     padding-block: calc(var(--spacing) * 5);
   }
+  .py-6 {
+    padding-block: calc(var(--spacing) * 6);
+  }
   .py-8 {
     padding-block: calc(var(--spacing) * 8);
   }
@@ -652,6 +688,9 @@
     --tw-tracking: var(--tracking-wider);
     letter-spacing: var(--tracking-wider);
   }
+  .text-blue-800 {
+    color: var(--color-blue-800);
+  }
   .text-gray-400 {
     color: var(--color-gray-400);
   }
@@ -736,6 +775,13 @@
       }
     }
   }
+  .hover\:text-blue-600 {
+    &:hover {
+      @media (hover: hover) {
+        color: var(--color-blue-600);
+      }
+    }
+  }
   .hover\:text-gray-900 {
     &:hover {
       @media (hover: hover) {
@@ -766,6 +812,28 @@
       }
     }
   }
+  .focus\:border-blue-500 {
+    &:focus {
+      border-color: var(--color-blue-500);
+    }
+  }
+  .focus\:ring-2 {
+    &:focus {
+      --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
+      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+    }
+  }
+  .focus\:ring-blue-500 {
+    &:focus {
+      --tw-ring-color: var(--color-blue-500);
+    }
+  }
+  .focus\:outline-none {
+    &:focus {
+      --tw-outline-style: none;
+      outline-style: none;
+    }
+  }
   .sm\:px-6 {
     @media (width >= 40rem) {
       padding-inline: calc(var(--spacing) * 6);

package/dist/subgraphs/builder-team/resolvers.js

@@ -19,14 +19,24 @@ export const getResolvers = (subgraph) => {
                             }
                         }
                         const doc = await reactor.getDocument(docId);
+                        // Sort spaces and packages by sortOrder
+                        const sortedState = {
+                            ...doc.state.global,
+                            spaces: [...doc.state.global.spaces]
+                                .sort((a, b) => a.sortOrder - b.sortOrder)
+                                .map(space => ({
+                                ...space,
+                                packages: [...space.packages].sort((a, b) => a.sortOrder - b.sortOrder)
+                            }))
+                        };
                         return {
                             driveId: driveId,
                             ...doc,
                             ...doc.header,
                             created: doc.header.createdAtUtcIso,
                             lastModified: doc.header.lastModifiedAtUtcIso,
-                            state: doc.state.global,
-                            stateJSON: doc.state.global,
+                            state: sortedState,
+                            stateJSON: sortedState,
                             revision: doc.header?.revision?.global ?? 0,
                         };
                     },
@@ -35,14 +45,24 @@ export const getResolvers = (subgraph) => {
                         const docsIds = await reactor.getDocuments(driveId);
                         const docs = await Promise.all(docsIds.map(async (docId) => {
                             const doc = await reactor.getDocument(docId);
+                            // Sort spaces and packages by sortOrder
+                            const sortedState = {
+                                ...doc.state.global,
+                                spaces: [...doc.state.global.spaces]
+                                    .sort((a, b) => a.sortOrder - b.sortOrder)
+                                    .map(space => ({
+                                    ...space,
+                                    packages: [...space.packages].sort((a, b) => a.sortOrder - b.sortOrder)
+                                }))
+                            };
                             return {
                                 driveId: driveId,
                                 ...doc,
                                 ...doc.header,
                                 created: doc.header.createdAtUtcIso,
                                 lastModified: doc.header.lastModifiedAtUtcIso,
-                                state: doc.state.global,
-                                stateJSON: doc.state.global,
+                                state: sortedState,
+                                stateJSON: sortedState,
                                 revision: doc.header?.revision?.global ?? 0,
                             };
                         }));
@@ -199,6 +219,18 @@ export const getResolvers = (subgraph) => {
                 }
                 return true;
             },
+            BuilderTeam_reorderSpaces: async (_, args) => {
+                const { docId, input } = args;
+                const doc = await reactor.getDocument(docId);
+                if (!doc) {
+                    throw new Error("Document not found");
+                }
+                const result = await reactor.addAction(docId, actions.reorderSpaces(input));
+                if (result.status !== "SUCCESS") {
+                    throw new Error(result.error?.message ?? "Failed to reorderSpaces");
+                }
+                return true;
+            },
             BuilderTeam_addPackage: async (_, args) => {
                 const { docId, input } = args;
                 const doc = await reactor.getDocument(docId);
@@ -235,6 +267,18 @@ export const getResolvers = (subgraph) => {
                 }
                 return true;
             },
+            BuilderTeam_reorderPackages: async (_, args) => {
+                const { docId, input } = args;
+                const doc = await reactor.getDocument(docId);
+                if (!doc) {
+                    throw new Error("Document not found");
+                }
+                const result = await reactor.addAction(docId, actions.reorderPackages(input));
+                if (result.status !== "SUCCESS") {
+                    throw new Error(result.error?.message ?? "Failed to reorderPackages");
+                }
+                return true;
+            },
         },
     };
 };

package/dist/subgraphs/builder-team/schema.js

@@ -36,6 +36,7 @@ export const schema = gql `
     title: String!
     description: String
     packages: [VetraPackageInfo!]!
+    sortOrder: Int!
   }
 
   type VetraPackageInfo {
@@ -46,6 +47,7 @@ export const schema = gql `
     github: String
     npm: String
     vetraDriveUrl: URL
+    sortOrder: Int!
   }
 
   """
@@ -121,6 +123,11 @@ export const schema = gql `
       docId: PHID
       input: BuilderTeam_RemoveSpaceInput
     ): Int
+    BuilderTeam_reorderSpaces(
+      driveId: String
+      docId: PHID
+      input: BuilderTeam_ReorderSpacesInput
+    ): Int
     BuilderTeam_addPackage(
       driveId: String
       docId: PHID
@@ -136,29 +143,29 @@ export const schema = gql `
       docId: PHID
       input: BuilderTeam_RemovePackageInput
     ): Int
+    BuilderTeam_reorderPackages(
+      driveId: String
+      docId: PHID
+      input: BuilderTeam_ReorderPackagesInput
+    ): Int
   }
 
   """
   Module: Profile
   """
   input BuilderTeam_SetLogoInput {
-    "Add your inputs here"
     logo: String
   }
   input BuilderTeam_SetTeamNameInput {
-    "Add your inputs here"
     name: String!
   }
   input BuilderTeam_SetSlugInput {
-    "Add your inputs here"
     slug: String!
   }
   input BuilderTeam_SetDescriptionInput {
-    "Add your inputs here"
     description: String
   }
   input BuilderTeam_SetSocialsInput {
-    "Add your inputs here"
     xProfile: String
     github: String
     website: String
@@ -168,11 +175,9 @@ export const schema = gql `
   Module: Member
   """
   input BuilderTeam_AddMemberInput {
-    "Add your inputs here"
     id: OID!
   }
   input BuilderTeam_UpdateMemberInfoInput {
-    "Add your inputs here"
     id: OID!
     phid: PHID
     ethAddress: String
@@ -180,7 +185,6 @@ export const schema = gql `
     profileImage: String
   }
   input BuilderTeam_RemoveMemberInput {
-    "Add your inputs here"
     id: OID!
   }
 
@@ -188,30 +192,29 @@ export const schema = gql `
   Module: Spaces
   """
   input BuilderTeam_AddSpaceInput {
-    "Add your inputs here"
     id: OID!
   }
   input BuilderTeam_UpdateSpaceInfoInput {
-    "Add your inputs here"
     id: OID!
     title: String
     description: String
   }
   input BuilderTeam_RemoveSpaceInput {
-    "Add your inputs here"
     id: OID!
   }
+  input BuilderTeam_ReorderSpacesInput {
+    spaceIds: [OID!]!
+    targetIndex: Int!
+  }
 
   """
   Module: Packages
   """
   input BuilderTeam_AddPackageInput {
-    "Add your inputs here"
     id: OID!
     spaceId: OID!
   }
   input BuilderTeam_UpdatePackageInfoInput {
-    "Add your inputs here"
     id: OID!
     spaceId: OID
     phid: PHID
@@ -222,7 +225,11 @@ export const schema = gql `
     vetraDriveUrl: URL
   }
   input BuilderTeam_RemovePackageInput {
-    "Add your inputs here"
     id: OID!
   }
+  input BuilderTeam_ReorderPackagesInput {
+    spaceId: OID!
+    packageIds: [OID!]!
+    targetIndex: Int!
+  }
 `;