@powerhousedao/contributor-billing 0.1.46 → 0.1.47

package/dist/editors/builder-team-admin/components/FolderTree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FolderTree.d.ts","sourceRoot":"","sources":["../../../../editors/builder-team-admin/components/FolderTree.tsx"],"names":[],"mappings":"AAgCA,iEAAiE;AACjE,MAAM,MAAM,UAAU,GAClB,cAAc,GACd,iBAAiB,GACjB,kBAAkB,GAClB,oBAAoB,GACpB,IAAI,CAAC;AA0GT,KAAK,eAAe,GAAG;IACrB,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;CACjD,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,EAAE,kBAAkB,EAAE,EAAE,eAAe,kDA0ZjE"}
+{"version":3,"file":"FolderTree.d.ts","sourceRoot":"","sources":["../../../../editors/builder-team-admin/components/FolderTree.tsx"],"names":[],"mappings":"AAiCA,iEAAiE;AACjE,MAAM,MAAM,UAAU,GAClB,cAAc,GACd,iBAAiB,GACjB,kBAAkB,GAClB,oBAAoB,GACpB,IAAI,CAAC;AA0GT,KAAK,eAAe,GAAG;IACrB,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;CACjD,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,EAAE,kBAAkB,EAAE,EAAE,eAAe,kDA0ajE"}

package/dist/editors/builder-team-admin/components/FolderTree.js

@@ -6,7 +6,8 @@ import { useMemo, useState } from "react";
 const ICON_SIZE = 16;
 const EXPENSE_REPORTS_FOLDER_NAME = "Expense Reports";
 const SNAPSHOT_REPORTS_FOLDER_NAME = "Snapshot Reports";
-const RESOURCE_TEMPLATES_FOLDER_NAME = "Resource Templates";
+const SERVICES_AND_OFFERINGS_FOLDER_NAME = "Services And Offerings";
+const RESOURCE_TEMPLATES_FOLDER_NAME = "Products";
 const SERVICE_OFFERINGS_FOLDER_NAME = "Service Offerings";
 /**
  * Maps navigation section IDs to their corresponding document types.
@@ -52,7 +53,7 @@ const BASE_NAVIGATION_SECTIONS = [
     },
     {
         id: "resources-services",
-        title: "Resources & Services",
+        title: "Service Offerings",
         icon: _jsx(Layers, { size: ICON_SIZE }),
     },
     {
@@ -122,20 +123,33 @@ export function FolderTree({ onCustomViewChange }) {
         const nodes = driveDocument.state.global.nodes;
         return nodes.find((node) => isFolderNodeKind(node) && node.name === SNAPSHOT_REPORTS_FOLDER_NAME);
     }, [driveDocument]);
-    // Find the "Resource Templates" folder in the drive
-    const resourceTemplatesFolder = useMemo(() => {
+    // Find the "Services And Offerings" parent folder in the drive (at root level)
+    const servicesAndOfferingsFolder = useMemo(() => {
         if (!driveDocument)
             return null;
         const nodes = driveDocument.state.global.nodes;
-        return nodes.find((node) => isFolderNodeKind(node) && node.name === RESOURCE_TEMPLATES_FOLDER_NAME);
+        return nodes.find((node) => isFolderNodeKind(node) &&
+            node.name === SERVICES_AND_OFFERINGS_FOLDER_NAME &&
+            !node.parentFolder);
     }, [driveDocument]);
-    // Find the "Service Offerings" folder in the drive
+    // Find the "Products" folder (inside Services And Offerings folder)
+    const resourceTemplatesFolder = useMemo(() => {
+        if (!driveDocument || !servicesAndOfferingsFolder)
+            return null;
+        const nodes = driveDocument.state.global.nodes;
+        return nodes.find((node) => isFolderNodeKind(node) &&
+            node.name === RESOURCE_TEMPLATES_FOLDER_NAME &&
+            node.parentFolder === servicesAndOfferingsFolder.id);
+    }, [driveDocument, servicesAndOfferingsFolder]);
+    // Find the "Service Offerings" folder (inside Services And Offerings folder)
     const serviceOfferingsFolder = useMemo(() => {
-        if (!driveDocument)
+        if (!driveDocument || !servicesAndOfferingsFolder)
             return null;
         const nodes = driveDocument.state.global.nodes;
-        return nodes.find((node) => isFolderNodeKind(node) && node.name === SERVICE_OFFERINGS_FOLDER_NAME);
-    }, [driveDocument]);
+        return nodes.find((node) => isFolderNodeKind(node) &&
+            node.name === SERVICE_OFFERINGS_FOLDER_NAME &&
+            node.parentFolder === servicesAndOfferingsFolder.id);
+    }, [driveDocument, servicesAndOfferingsFolder]);
     // Build a set of all node IDs that are within the Expense Reports folder tree
     const expenseReportsNodeIds = useMemo(() => {
         const nodeIds = new Set();
@@ -425,7 +439,7 @@ export function FolderTree({ onCustomViewChange }) {
             showCreateDocumentModal(documentType);
         }
     };
-    return (_jsx(SidebarProvider, { nodes: navigationSections, children: _jsx(Sidebar, { className: "pt-1", nodes: navigationSections, activeNodeId: activeNodeId, onActiveNodeChange: handleActiveNodeChange, sidebarTitle: "Builder Team Admin", showSearchBar: false, resizable: true, allowPinning: false, showStatusFilter: false, initialWidth: 256, defaultLevel: 2, handleOnTitleClick: () => {
+    return (_jsx(SidebarProvider, { nodes: navigationSections, children: _jsx(Sidebar, { className: "pt-1", nodes: navigationSections, activeNodeId: activeNodeId, onActiveNodeChange: handleActiveNodeChange, sidebarTitle: isOperator ? "Operator Team Admin" : "Builder Team Admin", showSearchBar: false, resizable: true, allowPinning: false, showStatusFilter: false, initialWidth: 256, defaultLevel: 2, handleOnTitleClick: () => {
                 onCustomViewChange?.(null);
                 setSelectedNode("");
             } }) }));

package/dist/editors/builder-team-admin/components/ResourcesServices.d.ts

@@ -1,7 +1,7 @@
 /**
  * Component for the Resources & Services custom view.
- * Shows two auto-generated folders: Resource Templates and Service Offerings.
- * Users can create powerhouse/resource-template docs in Resource Templates
+ * Shows folder structure: Services And Offerings > Products / Service Offerings.
+ * Users can create powerhouse/resource-template docs in Products
  * and powerhouse/service-offering docs in Service Offerings.
  */
 export declare function ResourcesServices(): import("react/jsx-runtime").JSX.Element;

package/dist/editors/builder-team-admin/components/ResourcesServices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ResourcesServices.d.ts","sourceRoot":"","sources":["../../../../editors/builder-team-admin/components/ResourcesServices.tsx"],"names":[],"mappings":"AAmBA;;;;;GAKG;AACH,wBAAgB,iBAAiB,4CAgQhC"}
+{"version":3,"file":"ResourcesServices.d.ts","sourceRoot":"","sources":["../../../../editors/builder-team-admin/components/ResourcesServices.tsx"],"names":[],"mappings":"AAoBA;;;;;GAKG;AACH,wBAAgB,iBAAiB,4CAwQhC"}

package/dist/editors/builder-team-admin/components/ResourcesServices.js

@@ -1,16 +1,17 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { FileItem } from "@powerhousedao/design-system/connect";
 import { FolderItem } from "@powerhousedao/design-system/connect";
 import { isFolderNodeKind, isFileNodeKind, setSelectedNode, useSelectedNodePath, useNodesInSelectedDriveOrFolder, useUserPermissions, showCreateDocumentModal, } from "@powerhousedao/reactor-browser";
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useRef } from "react";
 import { Plus, FileText, Package } from "lucide-react";
 import { useResourcesServicesAutoPlacement } from "../hooks/useResourcesServicesAutoPlacement.js";
-const RESOURCE_TEMPLATES_FOLDER_NAME = "Resource Templates";
+const SERVICES_AND_OFFERINGS_FOLDER_NAME = "Services And Offerings";
+const RESOURCE_TEMPLATES_FOLDER_NAME = "Products";
 const SERVICE_OFFERINGS_FOLDER_NAME = "Service Offerings";
 /**
  * Component for the Resources & Services custom view.
- * Shows two auto-generated folders: Resource Templates and Service Offerings.
- * Users can create powerhouse/resource-template docs in Resource Templates
+ * Shows folder structure: Services And Offerings > Products / Service Offerings.
+ * Users can create powerhouse/resource-template docs in Products
  * and powerhouse/service-offering docs in Service Offerings.
  */
 export function ResourcesServices() {
@@ -19,9 +20,11 @@ export function ResourcesServices() {
     const nodesInCurrentFolder = useNodesInSelectedDriveOrFolder();
     const { isAllowedToCreateDocuments } = useUserPermissions();
     // Use the shared auto-placement hook - this handles:
-    // 1. Creating the "Resource Templates" folder if it doesn't exist
-    // 2. Creating the "Service Offerings" folder if it doesn't exist
-    const { resourceTemplatesFolder, serviceOfferingsFolder, resourceTemplateDocuments, serviceOfferingDocuments, } = useResourcesServicesAutoPlacement();
+    // 1. Creating the "Services And Offerings" parent folder if it doesn't exist
+    // 2. Creating the "Products" subfolder if it doesn't exist
+    // 3. Creating the "Service Offerings" subfolder if it doesn't exist
+    // 4. Migrating existing documents from old folder structure
+    const { servicesAndOfferingsFolder, resourceTemplatesFolder, serviceOfferingsFolder, resourceTemplateDocuments, serviceOfferingDocuments, } = useResourcesServicesAutoPlacement();
     // Determine which folder we're currently in (if any)
     const currentFolderId = selectedNodePath.at(-1)?.id;
     const isInResourceTemplates = currentFolderId === resourceTemplatesFolder?.id;
@@ -29,17 +32,24 @@ export function ResourcesServices() {
     const isInRootView = !isInResourceTemplates && !isInServiceOfferings;
     // Navigate to root view initially (deselect any node)
     useEffect(() => {
-        if (resourceTemplatesFolder &&
+        if (servicesAndOfferingsFolder &&
+            resourceTemplatesFolder &&
             serviceOfferingsFolder &&
             !hasNavigatedToFolder.current) {
             hasNavigatedToFolder.current = true;
             // Don't select any node so we show the root view with both folders
             setSelectedNode("");
         }
-    }, [resourceTemplatesFolder, serviceOfferingsFolder]);
+    }, [
+        servicesAndOfferingsFolder,
+        resourceTemplatesFolder,
+        serviceOfferingsFolder,
+    ]);
     // Show loading state while folders are being created
-    if (!resourceTemplatesFolder || !serviceOfferingsFolder) {
-        return (_jsx("div", { className: "flex items-center justify-center h-64", children: _jsx("div", { className: "text-gray-500", children: "Setting up Resources & Services folders..." }) }));
+    if (!servicesAndOfferingsFolder ||
+        !resourceTemplatesFolder ||
+        !serviceOfferingsFolder) {
+        return (_jsx("div", { className: "flex items-center justify-center h-64", children: _jsxs("div", { className: "text-gray-500", children: ["Setting up ", SERVICES_AND_OFFERINGS_FOLDER_NAME, " folders..."] }) }));
     }
     // Handler for creating new documents
     const handleCreateDocument = (documentType, folderId) => {
@@ -54,10 +64,10 @@ export function ResourcesServices() {
     const fileNodes = nodesInCurrentFolder.filter((n) => isFileNodeKind(n));
     // Render the root view with both folder cards
     if (isInRootView) {
-        return (_jsxs("div", { children: [_jsx("div", { className: "text-2xl font-bold text-center mb-6", children: "Resources & Services" }), _jsxs("div", { className: "space-y-6 px-6", children: [_jsx("p", { className: "text-gray-600 text-center mb-8", children: "Manage your resource templates and service offerings. Click on a folder to view or create documents." }), _jsxs("div", { className: "grid grid-cols-1 md:grid-cols-2 gap-6", children: [_jsxs("div", { className: "border border-gray-200 rounded-lg p-6 hover:border-blue-400 hover:shadow-md transition-all cursor-pointer", onClick: () => setSelectedNode(resourceTemplatesFolder.id), children: [_jsxs("div", { className: "flex items-center gap-3 mb-4", children: [_jsx("div", { className: "p-2 bg-blue-50 rounded-lg", children: _jsx(FileText, { className: "w-6 h-6 text-blue-600" }) }), _jsx("h3", { className: "text-lg font-semibold", children: RESOURCE_TEMPLATES_FOLDER_NAME })] }), _jsx("p", { className: "text-gray-600 text-sm mb-4", children: "Define resource templates that can be used across service offerings." }), _jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("span", { className: "text-sm text-gray-500", children: [resourceTemplateDocuments.length, " template", resourceTemplateDocuments.length !== 1 ? "s" : ""] }), isAllowedToCreateDocuments && (_jsxs("button", { type: "button", className: "flex items-center gap-1 text-sm text-blue-600 hover:text-blue-800", onClick: (e) => {
+        return (_jsxs("div", { children: [_jsx("div", { className: "text-2xl font-bold text-center mb-6", children: SERVICES_AND_OFFERINGS_FOLDER_NAME }), _jsxs("div", { className: "space-y-6 px-6", children: [_jsx("p", { className: "text-gray-600 text-center mb-8", children: "Manage your products and service offerings. Click on a folder to view or create documents." }), _jsxs("div", { className: "grid grid-cols-1 md:grid-cols-2 gap-6", children: [_jsxs("div", { className: "border border-gray-200 rounded-lg p-6 hover:border-blue-400 hover:shadow-md transition-all cursor-pointer", onClick: () => setSelectedNode(resourceTemplatesFolder.id), children: [_jsxs("div", { className: "flex items-center gap-3 mb-4", children: [_jsx("div", { className: "p-2 bg-blue-50 rounded-lg", children: _jsx(FileText, { className: "w-6 h-6 text-blue-600" }) }), _jsx("h3", { className: "text-lg font-semibold", children: RESOURCE_TEMPLATES_FOLDER_NAME })] }), _jsx("p", { className: "text-gray-600 text-sm mb-4", children: "Define products that can be used across service offerings." }), _jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("span", { className: "text-sm text-gray-500", children: [resourceTemplateDocuments.length, " product", resourceTemplateDocuments.length !== 1 ? "s" : ""] }), isAllowedToCreateDocuments && (_jsxs("button", { type: "button", className: "flex items-center gap-1 text-sm bg-blue-500 text-white px-3 py-1 rounded-md hover:bg-blue-600 shadow-sm transition-colors", onClick: (e) => {
                                                         e.stopPropagation();
                                                         handleCreateDocument("powerhouse/resource-template", resourceTemplatesFolder.id);
-                                                    }, children: [_jsx(Plus, { size: 14 }), "Add new"] }))] })] }), _jsxs("div", { className: "border border-gray-200 rounded-lg p-6 hover:border-indigo-400 hover:shadow-md transition-all cursor-pointer", onClick: () => setSelectedNode(serviceOfferingsFolder.id), children: [_jsxs("div", { className: "flex items-center gap-3 mb-4", children: [_jsx("div", { className: "p-2 bg-indigo-50 rounded-lg", children: _jsx(Package, { className: "w-6 h-6 text-indigo-600" }) }), _jsx("h3", { className: "text-lg font-semibold", children: SERVICE_OFFERINGS_FOLDER_NAME })] }), _jsx("p", { className: "text-gray-600 text-sm mb-4", children: "Create and manage service offerings with pricing tiers and options." }), _jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("span", { className: "text-sm text-gray-500", children: [serviceOfferingDocuments.length, " offering", serviceOfferingDocuments.length !== 1 ? "s" : ""] }), isAllowedToCreateDocuments && (_jsxs("button", { type: "button", className: "flex items-center gap-1 text-sm text-indigo-600 hover:text-indigo-800", onClick: (e) => {
+                                                    }, children: [_jsx(Plus, { size: 14 }), "Add new"] }))] })] }), _jsxs("div", { className: "border border-gray-200 rounded-lg p-6 hover:border-indigo-400 hover:shadow-md transition-all cursor-pointer", onClick: () => setSelectedNode(serviceOfferingsFolder.id), children: [_jsxs("div", { className: "flex items-center gap-3 mb-4", children: [_jsx("div", { className: "p-2 bg-indigo-50 rounded-lg", children: _jsx(Package, { className: "w-6 h-6 text-indigo-600" }) }), _jsx("h3", { className: "text-lg font-semibold", children: SERVICE_OFFERINGS_FOLDER_NAME })] }), _jsx("p", { className: "text-gray-600 text-sm mb-4", children: "Create and manage service offerings with pricing tiers and options." }), _jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("span", { className: "text-sm text-gray-500", children: [serviceOfferingDocuments.length, " offering", serviceOfferingDocuments.length !== 1 ? "s" : ""] }), isAllowedToCreateDocuments && (_jsxs("button", { type: "button", className: "flex items-center gap-1 text-sm bg-indigo-500 text-white px-3 py-1 rounded-md hover:bg-indigo-600 shadow-sm transition-colors", onClick: (e) => {
                                                         e.stopPropagation();
                                                         handleCreateDocument("powerhouse/service-offering", serviceOfferingsFolder.id);
                                                     }, children: [_jsx(Plus, { size: 14 }), "Add new"] }))] })] })] })] })] }));
@@ -72,7 +82,5 @@ export function ResourcesServices() {
     const hasFolders = folderNodes.length > 0;
     const hasFiles = fileNodes.length > 0;
     const isEmpty = !hasFolders && !hasFiles;
-    return (_jsxs("div", { children: [_jsx("div", { className: "text-2xl font-bold text-center mb-4", children: currentFolderName }), _jsxs("div", { className: "space-y-6 px-6", children: [_jsxs("div", { className: "flex h-9 flex-row items-center gap-2 text-gray-500 border-b border-gray-200 pb-3", children: [_jsx("div", { className: "transition-colors hover:text-gray-800 cursor-pointer", onClick: () => setSelectedNode(""), role: "button", children: "Resources & Services" }), _jsx("span", { children: "/" }), _jsx("div", { className: "text-gray-800", children: currentFolderName }), _jsx("span", { children: "/" }), isAllowedToCreateDocuments && (_jsxs("button", { type: "button", className: "ml-1 flex items-center justify-center gap-2 rounded-md bg-gray-50 px-2 py-1.5 transition-colors hover:bg-gray-200 hover:text-gray-800", onClick: () => showCreateDocumentModal(documentType), children: [_jsx(Plus, { size: 14 }), "Add new"] }))] }), hasFolders && (_jsxs("div", { children: [_jsx("h3", { className: "mb-2 text-sm font-bold text-gray-600", children: "Folders" }), _jsx("div", { className: "flex flex-wrap gap-4", children: folderNodes.map((folderNode) => (_jsx(FolderItem, { folderNode: folderNode }, folderNode.id))) })] })), hasFiles && (_jsxs("div", { children: [_jsx("h3", { className: "mb-2 text-sm font-semibold text-gray-600", children: "Documents" }), _jsx("div", { className: "flex flex-wrap gap-4", children: fileNodes.map((fileNode) => (_jsx(FileItem, { fileNode: fileNode }, fileNode.id))) })] })), isEmpty && (_jsxs("div", { className: "flex flex-col items-center justify-center py-12 text-center", children: [_jsx("div", { className: "text-gray-400 mb-2", children: isInResourceTemplates ? (_jsx(FileText, { className: "w-16 h-16 mx-auto" })) : (_jsx(Package, { className: "w-16 h-16 mx-auto" })) }), _jsxs("p", { className: "text-gray-500 text-sm", children: ["No ", currentFolderName.toLowerCase(), " yet.", isAllowedToCreateDocuments && (_jsxs(_Fragment, { children: [" ", "Click \"Add new\" to create your first", " ", isInResourceTemplates
-                                                ? "resource template"
-                                                : "service offering", "."] }))] })] }))] })] }));
+    return (_jsxs("div", { children: [_jsx("div", { className: "text-2xl font-bold text-center mb-4", children: currentFolderName }), _jsxs("div", { className: "space-y-6 px-6", children: [_jsxs("div", { className: "flex h-9 flex-row items-center gap-2 text-gray-500 border-b border-gray-200 pb-3", children: [_jsx("div", { className: "transition-colors hover:text-gray-800 cursor-pointer", onClick: () => setSelectedNode(""), role: "button", children: SERVICES_AND_OFFERINGS_FOLDER_NAME }), _jsx("span", { children: "/" }), _jsx("div", { className: "text-gray-800", children: currentFolderName }), _jsx("span", { children: "/" }), isAllowedToCreateDocuments && (_jsxs("button", { type: "button", className: "ml-1 flex items-center justify-center gap-2 rounded-md bg-gray-50 px-2 py-1.5 transition-colors hover:bg-gray-200 hover:text-gray-800", onClick: () => showCreateDocumentModal(documentType), children: [_jsx(Plus, { size: 14 }), "Add new"] }))] }), hasFolders && (_jsxs("div", { children: [_jsx("h3", { className: "mb-2 text-sm font-bold text-gray-600", children: "Folders" }), _jsx("div", { className: "flex flex-wrap gap-4", children: folderNodes.map((folderNode) => (_jsx(FolderItem, { folderNode: folderNode }, folderNode.id))) })] })), hasFiles && (_jsxs("div", { children: [_jsx("h3", { className: "mb-2 text-sm font-semibold text-gray-600", children: "Documents" }), _jsx("div", { className: "flex flex-wrap gap-4", children: fileNodes.map((fileNode) => (_jsx(FileItem, { fileNode: fileNode }, fileNode.id))) })] })), isEmpty && (_jsxs("div", { className: "flex flex-col items-center justify-center py-12 text-center", children: [_jsx("div", { className: "text-gray-400 mb-2", children: isInResourceTemplates ? (_jsx(FileText, { className: "w-16 h-16 mx-auto" })) : (_jsx(Package, { className: "w-16 h-16 mx-auto" })) }), _jsxs("p", { className: "text-gray-500 text-sm", children: ["No ", currentFolderName.toLowerCase(), " yet.", isAllowedToCreateDocuments && (_jsxs(_Fragment, { children: [" ", "Click \"Add new\" to create your first", " ", isInResourceTemplates ? "product" : "service offering", "."] }))] })] }))] })] }));
 }

package/dist/editors/builder-team-admin/hooks/useResourcesServicesAutoPlacement.d.ts

@@ -1,26 +1,35 @@
 import type { FolderNode, FileNode } from "document-drive";
 interface UseResourcesServicesAutoPlacementResult {
-    /** The Resource Templates folder node, or null if it doesn't exist yet */
+    /** The parent "Services And Offerings" folder node, or null if it doesn't exist yet */
+    servicesAndOfferingsFolder: FolderNode | null;
+    /** The Products folder node (inside Services And Offerings), or null if it doesn't exist yet */
     resourceTemplatesFolder: FolderNode | null;
-    /** The Service Offerings folder node, or null if it doesn't exist yet */
+    /** The Service Offerings folder node (inside Services And Offerings), or null if it doesn't exist yet */
     serviceOfferingsFolder: FolderNode | null;
-    /** Set of all node IDs within the Resource Templates folder tree */
+    /** Set of all node IDs within the Products folder tree */
     resourceTemplatesNodeIds: Set<string>;
     /** Set of all node IDs within the Service Offerings folder tree */
     serviceOfferingsNodeIds: Set<string>;
-    /** All resource template documents within the Resource Templates folder */
+    /** All resource template documents within the Products folder */
     resourceTemplateDocuments: FileNode[];
     /** All service offering documents within the Service Offerings folder */
     serviceOfferingDocuments: FileNode[];
 }
 /**
- * Hook that handles automatic creation of "Resource Templates" and "Service Offerings" folders
- * for the Resources & Services section.
+ * Hook that handles automatic creation of "Services And Offerings" parent folder
+ * with "Products" and "Service Offerings" subfolders, and migrates existing documents
+ * from old folder structure.
+ *
+ * Folder structure:
+ * - Services And Offerings (parent folder)
+ *   - Products (for powerhouse/resource-template docs)
+ *   - Service Offerings (for powerhouse/service-offering docs)
  *
  * This hook:
- * 1. Creates the "Resource Templates" folder if it doesn't exist
- * 2. Creates the "Service Offerings" folder if it doesn't exist
- * 3. Provides access to documents within each folder
+ * 1. Creates the folder structure if it doesn't exist
+ * 2. Migrates existing documents from old folders to new structure
+ * 3. Deletes old folders after migration
+ * 4. Provides access to documents within each folder
  */
 export declare function useResourcesServicesAutoPlacement(): UseResourcesServicesAutoPlacementResult;
 export {};

package/dist/editors/builder-team-admin/hooks/useResourcesServicesAutoPlacement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useResourcesServicesAutoPlacement.d.ts","sourceRoot":"","sources":["../../../../editors/builder-team-admin/hooks/useResourcesServicesAutoPlacement.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAQ,MAAM,gBAAgB,CAAC;AAKjE,UAAU,uCAAuC;IAC/C,0EAA0E;IAC1E,uBAAuB,EAAE,UAAU,GAAG,IAAI,CAAC;IAC3C,yEAAyE;IACzE,sBAAsB,EAAE,UAAU,GAAG,IAAI,CAAC;IAC1C,oEAAoE;IACpE,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACtC,mEAAmE;IACnE,uBAAuB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACrC,2EAA2E;IAC3E,yBAAyB,EAAE,QAAQ,EAAE,CAAC;IACtC,yEAAyE;IACzE,wBAAwB,EAAE,QAAQ,EAAE,CAAC;CACtC;AAED;;;;;;;;GAQG;AACH,wBAAgB,iCAAiC,IAAI,uCAAuC,CAiJ3F"}
+{"version":3,"file":"useResourcesServicesAutoPlacement.d.ts","sourceRoot":"","sources":["../../../../editors/builder-team-admin/hooks/useResourcesServicesAutoPlacement.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAQ,MAAM,gBAAgB,CAAC;AAkBjE,UAAU,uCAAuC;IAC/C,uFAAuF;IACvF,0BAA0B,EAAE,UAAU,GAAG,IAAI,CAAC;IAC9C,gGAAgG;IAChG,uBAAuB,EAAE,UAAU,GAAG,IAAI,CAAC;IAC3C,yGAAyG;IACzG,sBAAsB,EAAE,UAAU,GAAG,IAAI,CAAC;IAC1C,0DAA0D;IAC1D,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACtC,mEAAmE;IACnE,uBAAuB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACrC,iEAAiE;IACjE,yBAAyB,EAAE,QAAQ,EAAE,CAAC;IACtC,yEAAyE;IACzE,wBAAwB,EAAE,QAAQ,EAAE,CAAC;CACtC;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,iCAAiC,IAAI,uCAAuC,CAuU3F"}

package/dist/editors/builder-team-admin/hooks/useResourcesServicesAutoPlacement.js

@@ -1,38 +1,89 @@
-import { useEffect, useMemo, useRef } from "react";
-import { isFolderNodeKind, isFileNodeKind, addFolder, useSelectedDrive, useDocumentsInSelectedDrive, } from "@powerhousedao/reactor-browser";
-const RESOURCE_TEMPLATES_FOLDER_NAME = "Resource Templates";
+import { useEffect, useMemo } from "react";
+import { isFolderNodeKind, isFileNodeKind, addFolder, useSelectedDrive, useNodeActions, dispatchActions, } from "@powerhousedao/reactor-browser";
+import { deleteNode } from "document-drive";
+const SERVICES_AND_OFFERINGS_FOLDER_NAME = "Services And Offerings";
+const PRODUCTS_FOLDER_NAME = "Products";
 const SERVICE_OFFERINGS_FOLDER_NAME = "Service Offerings";
+// Old folder names that might exist from previous structure (for migration)
+const OLD_RESOURCE_TEMPLATES_FOLDER_NAME = "Resource Templates";
+// Module-level tracking to prevent duplicate folder creation across all hook instances
+const globalCreationState = {
+    createdServicesAndOfferingsFolderForDrives: new Set(),
+    createdProductsFolderForDrives: new Set(),
+    createdServiceOfferingsFolderForDrives: new Set(),
+    processedDocs: new Map(), // driveId -> Set of doc IDs processed
+    migratedOldFolders: new Set(), // driveId where migration has been completed
+};
 /**
- * Hook that handles automatic creation of "Resource Templates" and "Service Offerings" folders
- * for the Resources & Services section.
+ * Hook that handles automatic creation of "Services And Offerings" parent folder
+ * with "Products" and "Service Offerings" subfolders, and migrates existing documents
+ * from old folder structure.
+ *
+ * Folder structure:
+ * - Services And Offerings (parent folder)
+ *   - Products (for powerhouse/resource-template docs)
+ *   - Service Offerings (for powerhouse/service-offering docs)
  *
  * This hook:
- * 1. Creates the "Resource Templates" folder if it doesn't exist
- * 2. Creates the "Service Offerings" folder if it doesn't exist
- * 3. Provides access to documents within each folder
+ * 1. Creates the folder structure if it doesn't exist
+ * 2. Migrates existing documents from old folders to new structure
+ * 3. Deletes old folders after migration
+ * 4. Provides access to documents within each folder
  */
 export function useResourcesServicesAutoPlacement() {
     const [driveDocument] = useSelectedDrive();
-    const documentsInDrive = useDocumentsInSelectedDrive();
-    // Track folder creation to prevent duplicates
-    const hasCreatedResourceTemplatesFolder = useRef(false);
-    const hasCreatedServiceOfferingsFolder = useRef(false);
-    // Find the "Resource Templates" folder in the drive
-    const resourceTemplatesFolder = useMemo(() => {
+    const { onMoveNode } = useNodeActions();
+    const driveId = driveDocument?.header.id;
+    // Initialize module-level tracking sets for this drive if needed
+    if (driveId && !globalCreationState.processedDocs.has(driveId)) {
+        globalCreationState.processedDocs.set(driveId, new Set());
+    }
+    // Find the "Services And Offerings" parent folder in the drive (at root level)
+    const servicesAndOfferingsFolder = useMemo(() => {
         if (!driveDocument)
             return null;
         const nodes = driveDocument.state.global.nodes;
         return (nodes.find((node) => isFolderNodeKind(node) &&
-            node.name === RESOURCE_TEMPLATES_FOLDER_NAME) ?? null);
+            node.name === SERVICES_AND_OFFERINGS_FOLDER_NAME &&
+            !node.parentFolder) ?? null);
     }, [driveDocument]);
-    // Find the "Service Offerings" folder in the drive
+    // Find the "Products" folder (must be inside Services And Offerings folder)
+    const resourceTemplatesFolder = useMemo(() => {
+        if (!driveDocument || !servicesAndOfferingsFolder)
+            return null;
+        const nodes = driveDocument.state.global.nodes;
+        return (nodes.find((node) => isFolderNodeKind(node) &&
+            node.name === PRODUCTS_FOLDER_NAME &&
+            node.parentFolder === servicesAndOfferingsFolder.id) ?? null);
+    }, [driveDocument, servicesAndOfferingsFolder]);
+    // Find the "Service Offerings" folder (must be inside Services And Offerings folder)
     const serviceOfferingsFolder = useMemo(() => {
+        if (!driveDocument || !servicesAndOfferingsFolder)
+            return null;
+        const nodes = driveDocument.state.global.nodes;
+        return (nodes.find((node) => isFolderNodeKind(node) &&
+            node.name === SERVICE_OFFERINGS_FOLDER_NAME &&
+            node.parentFolder === servicesAndOfferingsFolder.id) ?? null);
+    }, [driveDocument, servicesAndOfferingsFolder]);
+    // Find old folders that might exist from previous structure (at root level)
+    const oldResourceTemplatesFolder = useMemo(() => {
         if (!driveDocument)
             return null;
         const nodes = driveDocument.state.global.nodes;
-        return (nodes.find((node) => isFolderNodeKind(node) && node.name === SERVICE_OFFERINGS_FOLDER_NAME) ?? null);
+        return (nodes.find((node) => isFolderNodeKind(node) &&
+            (node.name === OLD_RESOURCE_TEMPLATES_FOLDER_NAME ||
+                node.name === PRODUCTS_FOLDER_NAME) &&
+            !node.parentFolder) ?? null);
     }, [driveDocument]);
-    // Build a set of all node IDs within the Resource Templates folder tree
+    const oldServiceOfferingsFolder = useMemo(() => {
+        if (!driveDocument)
+            return null;
+        const nodes = driveDocument.state.global.nodes;
+        return (nodes.find((node) => isFolderNodeKind(node) &&
+            node.name === SERVICE_OFFERINGS_FOLDER_NAME &&
+            !node.parentFolder) ?? null);
+    }, [driveDocument]);
+    // Build a set of all node IDs within the Products folder tree
     const resourceTemplatesNodeIds = useMemo(() => {
         const nodeIds = new Set();
         if (!resourceTemplatesFolder || !driveDocument)
@@ -76,7 +127,7 @@ export function useResourcesServicesAutoPlacement() {
         collectNodeIds(serviceOfferingsFolder.id);
         return nodeIds;
     }, [serviceOfferingsFolder, driveDocument]);
-    // Get resource template documents within the Resource Templates folder
+    // Get resource template documents within the Products folder
     const resourceTemplateDocuments = useMemo(() => {
         if (!driveDocument)
             return [];
@@ -92,27 +143,117 @@ export function useResourcesServicesAutoPlacement() {
             node.documentType === "powerhouse/service-offering" &&
             serviceOfferingsNodeIds.has(node.id));
     }, [driveDocument, serviceOfferingsNodeIds]);
-    // Create Resource Templates folder if it doesn't exist
+    // Step 1: Create "Services And Offerings" parent folder if it doesn't exist
+    useEffect(() => {
+        if (!driveId || servicesAndOfferingsFolder)
+            return;
+        if (globalCreationState.createdServicesAndOfferingsFolderForDrives.has(driveId))
+            return;
+        globalCreationState.createdServicesAndOfferingsFolderForDrives.add(driveId);
+        void addFolder(driveId, SERVICES_AND_OFFERINGS_FOLDER_NAME);
+    }, [driveId, servicesAndOfferingsFolder]);
+    // Step 2: Create "Products" subfolder if it doesn't exist (after parent exists)
     useEffect(() => {
-        if (!driveDocument ||
-            resourceTemplatesFolder ||
-            hasCreatedResourceTemplatesFolder.current)
+        if (!driveId || !servicesAndOfferingsFolder || resourceTemplatesFolder)
             return;
-        hasCreatedResourceTemplatesFolder.current = true;
-        const driveId = driveDocument.header.id;
-        void addFolder(driveId, RESOURCE_TEMPLATES_FOLDER_NAME);
-    }, [driveDocument, resourceTemplatesFolder]);
-    // Create Service Offerings folder if it doesn't exist
+        if (globalCreationState.createdProductsFolderForDrives.has(driveId))
+            return;
+        globalCreationState.createdProductsFolderForDrives.add(driveId);
+        void addFolder(driveId, PRODUCTS_FOLDER_NAME, servicesAndOfferingsFolder.id);
+    }, [driveId, servicesAndOfferingsFolder, resourceTemplatesFolder]);
+    // Step 3: Create "Service Offerings" subfolder if it doesn't exist (after parent exists)
     useEffect(() => {
-        if (!driveDocument ||
-            serviceOfferingsFolder ||
-            hasCreatedServiceOfferingsFolder.current)
+        if (!driveId || !servicesAndOfferingsFolder || serviceOfferingsFolder)
+            return;
+        if (globalCreationState.createdServiceOfferingsFolderForDrives.has(driveId))
+            return;
+        globalCreationState.createdServiceOfferingsFolderForDrives.add(driveId);
+        void addFolder(driveId, SERVICE_OFFERINGS_FOLDER_NAME, servicesAndOfferingsFolder.id);
+    }, [driveId, servicesAndOfferingsFolder, serviceOfferingsFolder]);
+    // Step 4: Migrate documents from old folders to new structure and delete old folders
+    useEffect(() => {
+        if (!driveId ||
+            !driveDocument ||
+            !resourceTemplatesFolder ||
+            !serviceOfferingsFolder)
+            return;
+        if (globalCreationState.migratedOldFolders.has(driveId))
             return;
-        hasCreatedServiceOfferingsFolder.current = true;
-        const driveId = driveDocument.header.id;
-        void addFolder(driveId, SERVICE_OFFERINGS_FOLDER_NAME);
-    }, [driveDocument, serviceOfferingsFolder]);
+        const allNodes = driveDocument.state.global.nodes;
+        const processedDocs = globalCreationState.processedDocs.get(driveId);
+        if (!processedDocs)
+            return;
+        // Find all resource template documents that are NOT in the correct folder
+        const resourceTemplatesToMigrate = allNodes.filter((node) => isFileNodeKind(node) &&
+            node.documentType === "powerhouse/resource-template" &&
+            !resourceTemplatesNodeIds.has(node.id) &&
+            !processedDocs.has(node.id));
+        // Find all service offering documents that are NOT in the correct folder
+        const serviceOfferingsToMigrate = allNodes.filter((node) => isFileNodeKind(node) &&
+            node.documentType === "powerhouse/service-offering" &&
+            !serviceOfferingsNodeIds.has(node.id) &&
+            !processedDocs.has(node.id));
+        // Move resource templates to Products folder
+        for (const fileNode of resourceTemplatesToMigrate) {
+            processedDocs.add(fileNode.id);
+            onMoveNode(fileNode, resourceTemplatesFolder).catch((error) => {
+                console.error(`Failed to migrate resource template:`, error);
+                processedDocs.delete(fileNode.id);
+            });
+        }
+        // Move service offerings to Service Offerings folder
+        for (const fileNode of serviceOfferingsToMigrate) {
+            processedDocs.add(fileNode.id);
+            onMoveNode(fileNode, serviceOfferingsFolder).catch((error) => {
+                console.error(`Failed to migrate service offering:`, error);
+                processedDocs.delete(fileNode.id);
+            });
+        }
+        // Delete old folders if they exist and are empty (after migration)
+        const checkAndDeleteOldFolders = () => {
+            // Check if old resource templates folder is empty and delete it
+            if (oldResourceTemplatesFolder) {
+                const childrenInOldResourceTemplates = allNodes.filter((node) => (isFolderNodeKind(node) || isFileNodeKind(node)) &&
+                    node.parentFolder === oldResourceTemplatesFolder.id);
+                if (childrenInOldResourceTemplates.length === 0) {
+                    dispatchActions(deleteNode({ id: oldResourceTemplatesFolder.id }), driveId).catch((error) => {
+                        console.error(`Failed to delete old Resource Templates folder:`, error);
+                    });
+                }
+            }
+            // Check if old service offerings folder is empty and delete it
+            if (oldServiceOfferingsFolder) {
+                const childrenInOldServiceOfferings = allNodes.filter((node) => (isFolderNodeKind(node) || isFileNodeKind(node)) &&
+                    node.parentFolder === oldServiceOfferingsFolder.id);
+                if (childrenInOldServiceOfferings.length === 0) {
+                    dispatchActions(deleteNode({ id: oldServiceOfferingsFolder.id }), driveId).catch((error) => {
+                        console.error(`Failed to delete old Service Offerings folder:`, error);
+                    });
+                }
+            }
+            globalCreationState.migratedOldFolders.add(driveId);
+        };
+        // Delay deletion to allow migrations to complete
+        if (resourceTemplatesToMigrate.length === 0 &&
+            serviceOfferingsToMigrate.length === 0) {
+            checkAndDeleteOldFolders();
+        }
+        else {
+            setTimeout(checkAndDeleteOldFolders, 1000);
+        }
+    }, [
+        driveId,
+        driveDocument,
+        resourceTemplatesFolder,
+        serviceOfferingsFolder,
+        resourceTemplatesNodeIds,
+        serviceOfferingsNodeIds,
+        oldResourceTemplatesFolder,
+        oldServiceOfferingsFolder,
+        onMoveNode,
+    ]);
     return {
+        servicesAndOfferingsFolder,
         resourceTemplatesFolder,
         serviceOfferingsFolder,
         resourceTemplatesNodeIds,

package/dist/style.css

@@ -80,7 +80,6 @@
     --color-indigo-500: oklch(58.5% 0.233 277.117);
     --color-indigo-600: oklch(51.1% 0.262 276.966);
     --color-indigo-700: oklch(45.7% 0.24 277.023);
-    --color-indigo-800: oklch(39.8% 0.195 277.366);
     --color-violet-50: oklch(96.9% 0.016 293.756);
     --color-violet-500: oklch(60.6% 0.25 292.717);
     --color-violet-600: oklch(54.1% 0.281 293.009);
@@ -2672,13 +2671,6 @@
       }
     }
   }
-  .hover\:text-indigo-800 {
-    &:hover {
-      @media (hover: hover) {
-        color: var(--color-indigo-800);
-      }
-    }
-  }
   .hover\:text-red-500 {
     &:hover {
       @media (hover: hover) {

package/dist/subgraphs/resources-services/resolvers.js

@@ -22,7 +22,7 @@ export const getResolvers = (subgraph) => {
                             if (operatorId && state.operatorId !== operatorId) {
                                 return [];
                             }
-                            return [mapResourceTemplateState(state)];
+                            return [mapResourceTemplateState(state, doc)];
                         }
                     }
                     catch {
@@ -59,7 +59,7 @@ export const getResolvers = (subgraph) => {
                                 if (operatorId && state.operatorId !== operatorId) {
                                     continue;
                                 }
-                                resourceTemplates.push(mapResourceTemplateState(state));
+                                resourceTemplates.push(mapResourceTemplateState(state, doc));
                             }
                         }
                     }
@@ -93,7 +93,7 @@ export const getResolvers = (subgraph) => {
                                 state.resourceTemplateId !== resourceTemplateId) {
                                 return [];
                             }
-                            return [mapServiceOfferingState(state)];
+                            return [mapServiceOfferingState(state, doc)];
                         }
                     }
                     catch {
@@ -135,7 +135,7 @@ export const getResolvers = (subgraph) => {
                                     state.resourceTemplateId !== resourceTemplateId) {
                                     continue;
                                 }
-                                serviceOfferings.push(mapServiceOfferingState(state));
+                                serviceOfferings.push(mapServiceOfferingState(state, doc));
                             }
                         }
                     }
@@ -151,9 +151,9 @@ export const getResolvers = (subgraph) => {
 /**
  * Map ResourceTemplateState from document model to GraphQL response
  */
-function mapResourceTemplateState(state) {
+function mapResourceTemplateState(state, doc) {
     return {
-        id: state.id,
+        id: doc.header.id,
         operatorId: state.operatorId,
         title: state.title,
         summary: state.summary,
@@ -214,9 +214,9 @@ function mapResourceTemplateState(state) {
 /**
  * Map ServiceOfferingState from document model to GraphQL response
  */
-function mapServiceOfferingState(state) {
+function mapServiceOfferingState(state, doc) {
     return {
-        id: state.id,
+        id: doc.header.id,
         operatorId: state.operatorId,
         resourceTemplateId: state.resourceTemplateId || null,
         title: state.title,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@powerhousedao/contributor-billing",
   "description": "Document models that help contributors of open organisations get paid anonymously for their work on a monthly basis.",
-  "version": "0.1.46",
+  "version": "0.1.47",
   "license": "AGPL-3.0-only",
   "type": "module",
   "files": [