@powerhousedao/contributor-billing 0.1.23 → 0.1.24

package/dist/editors/contributor-billing/components/InvoiceTable/HeaderControls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HeaderControls.d.ts","sourceRoot":"","sources":["../../../../../editors/contributor-billing/components/InvoiceTable/HeaderControls.tsx"],"names":[],"mappings":"AAqBA,eAAO,MAAM,cAAc,GAAI,qSAgB5B;IACD,aAAa,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACnD,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,IAAI,CAAC;IACpD,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,qBAAqB,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACvD,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,0BAA0B,CAAC,EAAE,MAAM,IAAI,CAAC;IACxC,eAAe,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;IAC7B,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC;IACtC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,gBAAgB,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;IAC9B,2BAA2B,CAAC,EAAE,MAAM,IAAI,CAAC;IACzC,QAAQ,CAAC,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IACrC,4BAA4B,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,WAAW,EAAE,CAAC,QAAQ,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;CAC5D,4CAySA,CAAC"}
+{"version":3,"file":"HeaderControls.d.ts","sourceRoot":"","sources":["../../../../../editors/contributor-billing/components/InvoiceTable/HeaderControls.tsx"],"names":[],"mappings":"AAqBA,eAAO,MAAM,cAAc,GAAI,qSAgB5B;IACD,aAAa,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACnD,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,IAAI,CAAC;IACpD,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,qBAAqB,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACvD,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,0BAA0B,CAAC,EAAE,MAAM,IAAI,CAAC;IACxC,eAAe,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;IAC7B,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC;IACtC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,gBAAgB,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;IAC9B,2BAA2B,CAAC,EAAE,MAAM,IAAI,CAAC;IACzC,QAAQ,CAAC,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IACrC,4BAA4B,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,WAAW,EAAE,CAAC,QAAQ,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;CAC5D,4CAgTA,CAAC"}

package/dist/editors/contributor-billing/components/InvoiceTable/HeaderControls.js

@@ -36,7 +36,7 @@ export const HeaderControls = ({ statusOptions = [], onStatusChange, onSearchCha
     const billingStatements = allDocuments?.filter((doc) => {
         return doc.header.documentType === "powerhouse/billing-statement";
     });
-    const handleBatchAction = (action) => {
+    const handleBatchAction = async (action) => {
         if (action === "export-csv-expense-report") {
             setShowExpenseReportCurrencyModal(true);
             const updatedSelected = { ...selected };
@@ -103,10 +103,16 @@ export const HeaderControls = ({ statusOptions = [], onStatusChange, onSearchCha
                 return;
             }
             // Create billing statements for invoices that don't have them yet
-            invoicesToProcess.forEach(async (id) => {
-                setSelected({ ...selected, [id]: false });
+            // Process sequentially to avoid race conditions
+            for (const id of invoicesToProcess) {
                 await handleCreateBillingStatement(id);
+            }
+            // Update all selected IDs at once after processing
+            const updatedSelected = { ...selected };
+            invoicesToProcess.forEach((id) => {
+                updatedSelected[id] = false;
             });
+            setSelected(updatedSelected);
             // Reset the select value after action is triggered
             setTimeout(() => setSelectedBatchAction(undefined), 100);
         }

package/dist/editors/contributor-billing/components/InvoiceTable/InvoiceTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InvoiceTable.d.ts","sourceRoot":"","sources":["../../../../../editors/contributor-billing/components/InvoiceTable/InvoiceTable.tsx"],"names":[],"mappings":"AAaA,OAAO,EAKL,KAAK,wBAAwB,EAC9B,MAAM,gCAAgC,CAAC;AAexC,KAAK,YAAY,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAExE,UAAU,iBAAiB;IACzB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,KAAK,EAAE,GAAG,EAAE,CAAC;IACb,QAAQ,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IACpC,WAAW,EAAE,CACX,QAAQ,EACJ;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,GACzB,CAAC,CAAC,IAAI,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,KAAK;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC,KACjE,IAAI,CAAC;IACV,sBAAsB,EAAE,wBAAwB,EAAE,CAAC;IACnD,qBAAqB,EAAE,CAAC,KAAK,EAAE,wBAAwB,KAAK,IAAI,CAAC;IACjE,gBAAgB,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,GAAG,CAAC;IACtC,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,IAAI,CAAC;IACnD,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7E,qBAAqB,EAAE,MAAM,OAAO,CAAC;CACtC;AAED,eAAO,MAAM,YAAY,GAAI,oLAY1B,iBAAiB,4CAiqBnB,CAAC"}
+{"version":3,"file":"InvoiceTable.d.ts","sourceRoot":"","sources":["../../../../../editors/contributor-billing/components/InvoiceTable/InvoiceTable.tsx"],"names":[],"mappings":"AAaA,OAAO,EAKL,KAAK,wBAAwB,EAC9B,MAAM,gCAAgC,CAAC;AAiBxC,KAAK,YAAY,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAExE,UAAU,iBAAiB;IACzB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,KAAK,EAAE,GAAG,EAAE,CAAC;IACb,QAAQ,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IACpC,WAAW,EAAE,CACX,QAAQ,EACJ;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,GACzB,CAAC,CAAC,IAAI,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,KAAK;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC,KACjE,IAAI,CAAC;IACV,sBAAsB,EAAE,wBAAwB,EAAE,CAAC;IACnD,qBAAqB,EAAE,CAAC,KAAK,EAAE,wBAAwB,KAAK,IAAI,CAAC;IACjE,gBAAgB,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,GAAG,CAAC;IACtC,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,IAAI,CAAC;IACnD,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7E,qBAAqB,EAAE,MAAM,OAAO,CAAC;CACtC;AAED,eAAO,MAAM,YAAY,GAAI,oLAY1B,iBAAiB,4CA0qBnB,CAAC"}

package/dist/editors/contributor-billing/components/InvoiceTable/InvoiceTable.js

@@ -10,6 +10,7 @@ import { exportExpenseReportCSV } from "../../../../scripts/contributor-billing/
 import { toast } from "@powerhousedao/design-system/connect";
 import { actions, } from "../../../../document-models/invoice/index.js";
 import { addDocument, useSelectedDrive, dispatchActions, setSelectedNode, } from "@powerhousedao/reactor-browser";
+import { useReactor } from "@powerhousedao/reactor-browser/connect";
 import { actions as billingStatementActions } from "../../../../document-models/billing-statement/index.js";
 const statusOptions = [
     { label: "Draft", value: "DRAFT" },
@@ -24,6 +25,7 @@ const statusOptions = [
 ];
 export const InvoiceTable = ({ files, state, selected, setSelected, filteredDocumentModels, onSelectDocumentModel, getDocDispatcher, selectedStatuses, onStatusChange, onRowSelection, canExportSelectedRows, }) => {
     const [selectedDrive] = useSelectedDrive();
+    const reactor = useReactor();
     const billingDocStates = state
         .filter((doc) => doc.header.documentType === "powerhouse/billing-statement")
         .map((doc) => ({
@@ -94,10 +96,7 @@ export const InvoiceTable = ({ files, state, selected, setSelected, filteredDocu
             console.error("Failed to create billing statement");
             return;
         }
-        await dispatchActions(billingStatementActions.editContributor({
-            contributor: id,
-        }), createdNode.id);
-        // Prepare billing statement data with empty input handlers
+        // Prepare billing statement data
         const billingStatementData = {
             dateIssued: invoiceState.state.global.dateIssued &&
                 invoiceState.state.global.dateIssued.trim() !== ""
@@ -110,33 +109,46 @@ export const InvoiceTable = ({ files, state, selected, setSelected, filteredDocu
             currency: invoiceState.state.global.currency || "",
             notes: invoiceState.state.global.notes || "",
         };
-        await dispatchActions(billingStatementActions.editBillingStatement(billingStatementData), createdNode.id);
-        // add line items from invoiceState to billing statement
-        invoiceState.state.global.lineItems.forEach(async (lineItem) => {
-            await dispatchActions(billingStatementActions.addLineItem({
-                id: lineItem.id,
-                description: lineItem.description,
-                quantity: lineItem.quantity,
-                // Map invoice fields to billing statement fields
-                totalPriceCash: lineItem.totalPriceTaxIncl || 0,
-                totalPricePwt: 0, // Default to 0 since invoice doesn't have POWT pricing
-                unit: "UNIT", // Default to UNIT since invoice doesn't have unit field
-                unitPriceCash: lineItem.unitPriceTaxIncl || 0,
-                unitPricePwt: 0, // Default to 0 since invoice doesn't have POWT pricing
-            }), createdNode.id);
-        });
-        // add tags from each invoice line item to billing statement line item
-        invoiceState.state.global.lineItems.forEach(async (lineItem) => {
+        // Dispatch initial setup actions together
+        await dispatchActions([
+            billingStatementActions.editContributor({
+                contributor: id,
+            }),
+            billingStatementActions.editBillingStatement(billingStatementData),
+        ], createdNode.id);
+        // Collect all line item actions
+        const lineItemActions = invoiceState.state.global.lineItems.map((lineItem) => billingStatementActions.addLineItem({
+            id: lineItem.id,
+            description: lineItem.description,
+            quantity: lineItem.quantity,
+            // Map invoice fields to billing statement fields
+            totalPriceCash: lineItem.totalPriceTaxIncl || 0,
+            totalPricePwt: 0, // Default to 0 since invoice doesn't have POWT pricing
+            unit: "UNIT", // Default to UNIT since invoice doesn't have unit field
+            unitPriceCash: lineItem.unitPriceTaxIncl || 0,
+            unitPricePwt: 0, // Default to 0 since invoice doesn't have POWT pricing
+        }));
+        // Dispatch all line items in one batch
+        if (lineItemActions.length > 0) {
+            await dispatchActions(lineItemActions, createdNode.id);
+        }
+        // Collect all tag actions
+        const tagActions = [];
+        for (const lineItem of invoiceState.state.global.lineItems) {
             const lineItemTag = mapTags(lineItem.lineItemTag || []);
-            lineItemTag.forEach(async (tag) => {
-                await dispatchActions(billingStatementActions.editLineItemTag({
+            for (const tag of lineItemTag) {
+                tagActions.push(billingStatementActions.editLineItemTag({
                     lineItemId: lineItem.id,
                     dimension: tag.dimension,
                     value: tag.value,
                     label: tag.label,
-                }), createdNode.id);
-            });
-        });
+                }));
+            }
+        }
+        // Dispatch all tags in one batch
+        if (tagActions.length > 0) {
+            await dispatchActions(tagActions, createdNode.id);
+        }
     };
     const selectedInvoiceIds = Object.keys(selected).filter((id) => selected[id]);
     const selectedInvoices = selectedInvoiceIds

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.23",
+  "version": "0.1.24",
   "license": "AGPL-3.0-only",
   "type": "module",
   "files": [