@paro.io/expert-shared-components 1.12.24 → 1.12.25

package/lib/components/Invoices/DecisionSection.js

@@ -97,25 +97,33 @@ const DecisionSection = ({ dispute, onUpdateDispute, updateInvoiceMutation, upda
         handleFinalSubmit(submissionData);
     };
     const handleFinalSubmit = (submissionData) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         setIsSubmitting(true);
         try {
-            const finalApprovedHours = getTotalApprovedHours();
-            // Determine resolution type based on approval
-            const isFullApproval = resolution === 'APPROVED' ||
-                (resolution === 'PARTIAL' && Math.abs(finalApprovedHours - totalDisputeHours) <= 0.01);
-            const resolutionType = isFullApproval ? 'Upheld' : 'Reduced';
-            // Update dispute projects with resolution details
+            const resolutionType = resolution === 'APPROVED' ? 'Upheld' : 'Reduced';
             const disputeProjectUpdates = ((_a = dispute === null || dispute === void 0 ? void 0 : dispute.disputeProjects) === null || _a === void 0 ? void 0 : _a.map((project) => ({
                 projectId: project.projectId,
                 resolutionMode: 'Direct',
                 resolutionType: resolution === 'DECLINED' ? 'Canceled' : resolutionType
             }))) || [];
-            // Calculate approved amount based on dispute types
-            const hasNonHourlyProjects = (_b = dispute === null || dispute === void 0 ? void 0 : dispute.disputeProjects) === null || _b === void 0 ? void 0 : _b.some((project) => project.disputeType !== 'Hourly');
-            const calculatedApprovedAmount = hasNonHourlyProjects
-                ? finalApprovedHours // For non-hourly projects, finalApprovedHours contains the dollar amount
-                : finalApprovedHours * ((submissionData === null || submissionData === void 0 ? void 0 : submissionData.freelancerRate) || 0); // For hourly projects, multiply by rate
+            let calculatedApprovedAmount = 0;
+            const fullDisputeAmount = (_b = dispute === null || dispute === void 0 ? void 0 : dispute.disputeProjects) === null || _b === void 0 ? void 0 : _b.reduce((acc, project) => acc + project.disputeAmount, 0);
+            if (resolution === 'APPROVED') {
+                calculatedApprovedAmount = fullDisputeAmount;
+            }
+            else {
+                (_c = dispute === null || dispute === void 0 ? void 0 : dispute.disputeProjects) === null || _c === void 0 ? void 0 : _c.forEach((project) => {
+                    var _a, _b;
+                    const approvedForProject = projectApprovedHours[project.projectId] || 0;
+                    if (project.disputeType === 'Hourly') {
+                        const clientRate = ((_b = (_a = submissionData === null || submissionData === void 0 ? void 0 : submissionData.input) === null || _a === void 0 ? void 0 : _a.find((p) => p.projectId === project.projectId)) === null || _b === void 0 ? void 0 : _b.clientRate) || 0;
+                        calculatedApprovedAmount += approvedForProject * clientRate;
+                    }
+                    else {
+                        calculatedApprovedAmount += approvedForProject;
+                    }
+                });
+            }
             const updateData = {
                 disputeId: dispute.disputeId,
                 status: "Resolved",
@@ -123,9 +131,7 @@ const DecisionSection = ({ dispute, onUpdateDispute, updateInvoiceMutation, upda
                 finalDecisionOwnerId: (user === null || user === void 0 ? void 0 : user.userId) || null,
                 projectDisputes: disputeProjectUpdates
             };
-            // If we have adjusted hours, include them in the update
             if (submissionData) {
-                // Call the updateInvoiceMutation with the submission data
                 yield updateInvoiceMutation({
                     variables: {
                         input: submissionData.input,

package/lib/components/Invoices/ProjectHoursAdjustmentModal.d.ts

@@ -33,5 +33,5 @@ interface ProjectHoursAdjustmentModalProps {
     };
     user: any;
 }
-export declare const ProjectHoursAdjustmentModal: ({ isOpen, onClose, disputeProjects, dispute, onSubmit, isSubmitting, getClientInvoiceSummaryByMonth, invoiceSummary, approvedHours, projectApprovedHours, user, }: ProjectHoursAdjustmentModalProps) => JSX.Element;
+export declare const ProjectHoursAdjustmentModal: ({ isOpen, onClose, disputeProjects, dispute, onSubmit, isSubmitting, getClientInvoiceSummaryByMonth, invoiceSummary, projectApprovedHours, user, }: ProjectHoursAdjustmentModalProps) => JSX.Element;
 export {};

package/lib/components/Invoices/ProjectHoursAdjustmentModal.js

@@ -35,7 +35,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectHoursAdjustmentModal = void 0;
 const react_1 = __importStar(require("react"));
 const base_ui_1 = require("@paro.io/base-ui");
-const ProjectHoursAdjustmentModal = ({ isOpen, onClose, disputeProjects, dispute, onSubmit, isSubmitting, getClientInvoiceSummaryByMonth, invoiceSummary, approvedHours, projectApprovedHours, user, }) => {
+const ProjectHoursAdjustmentModal = ({ isOpen, onClose, disputeProjects, dispute, onSubmit, isSubmitting, getClientInvoiceSummaryByMonth, invoiceSummary, projectApprovedHours, user, }) => {
     var _a, _b;
     const [adjustedHours, setAdjustedHours] = (0, react_1.useState)({});
     const [errors, setErrors] = (0, react_1.useState)({});
@@ -186,11 +186,7 @@ const ProjectHoursAdjustmentModal = ({ isOpen, onClose, disputeProjects, dispute
         const newProjectErrors = {};
         projectSections.forEach(section => {
             const projectId = section.projectId;
-            const maxAllowedReduction = projectApprovedHours[projectId] !== undefined
-                ? projectApprovedHours[projectId]
-                : section.disputeType === 'Hourly'
-                    ? section.disputeHours
-                    : section.disputeAmount;
+            const maxAllowedReduction = getMaxAllowedReduction(section);
             section.tasks.forEach(task => {
                 var _a, _b, _c, _d;
                 const projectHourId = task.projectHourId;
@@ -287,14 +283,20 @@ const ProjectHoursAdjustmentModal = ({ isOpen, onClose, disputeProjects, dispute
     const areAllProjectsValid = () => {
         return projectSections.every(section => {
             const projectReduction = getProjectReduction(section.projectId);
-            const maxAllowedReduction = projectApprovedHours[section.projectId] !== undefined
-                ? projectApprovedHours[section.projectId]
-                : section.disputeType === 'Hourly'
-                    ? section.disputeHours
-                    : section.disputeAmount;
+            const maxAllowedReduction = getMaxAllowedReduction(section);
             return Math.abs(projectReduction - maxAllowedReduction) <= 0.01;
         });
     };
+    const getMaxAllowedReduction = (section) => {
+        const isPartialApproval = projectApprovedHours[section.projectId] !== undefined;
+        const isHourly = section.disputeType === 'Hourly';
+        if (isPartialApproval) {
+            return isHourly
+                ? section.disputeHours - projectApprovedHours[section.projectId]
+                : section.disputeAmount - projectApprovedHours[section.projectId];
+        }
+        return isHourly ? section.disputeHours : section.disputeAmount;
+    };
     if (loading) {
         return (react_1.default.createElement(base_ui_1.Modal, { open: isOpen, onClose: onClose, size: "lg", className: "z-[100]" },
             react_1.default.createElement("div", { className: "flex justify-center items-center py-8" },
@@ -316,11 +318,7 @@ const ProjectHoursAdjustmentModal = ({ isOpen, onClose, disputeProjects, dispute
             react_1.default.createElement("div", { className: "space-y-8" }, projectSections.map((section) => {
                 var _a, _b;
                 const projectReduction = getProjectReduction(section.projectId) || 0;
-                const maxAllowedReduction = projectApprovedHours[section.projectId] !== undefined
-                    ? projectApprovedHours[section.projectId]
-                    : section.disputeType === 'Hourly'
-                        ? section.disputeHours
-                        : section.disputeAmount;
+                const maxAllowedReduction = getMaxAllowedReduction(section);
                 const isProjectValid = Math.abs(projectReduction - maxAllowedReduction) <= 0.01;
                 const isPartialApproval = projectApprovedHours[section.projectId] !== undefined;
                 return (react_1.default.createElement("div", { key: section.projectId, className: "border border-gray-200 rounded-lg p-6" },

package/lib/components/Invoices/TestDecisionSection.d.ts

@@ -1 +1 @@
-export declare const TestDecisionSection: () => JSX.Element;
+export declare const TestDecisionSection: () => JSX.Element;

package/lib/components/Invoices/TestDecisionSection.js

@@ -1,126 +1,126 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TestDecisionSection = void 0;
-const react_1 = __importDefault(require("react"));
-const DecisionSection_1 = require("./DecisionSection");
-// Test data from the provided JSON
-const testDispute = {
-    "__typename": "ClientInvoiceDispute",
-    "disputeId": 35,
-    "approvedAmount": 450,
-    "chatEnabled": true,
-    "disputeDate": "2025-05-22",
-    "disputeUpdatedDate": "2025-05-23",
-    "freelancerId": 8081,
-    "freelancer": {
-        "__typename": "User",
-        "id": 8081,
-        "email": "andpande@gmail.com",
-        "firstName": "William",
-        "lastName": "Annon"
-    },
-    "status": "Resolved",
-    "finalDecisionOwnerId": 29005,
-    "invoice": {
-        "__typename": "ClientInvoice",
-        "amount": 450,
-        "balanceDue": 450,
-        "clientId": 4433,
-        "dateGenerated": "2025-04-14",
-        "id": 175325,
-        "month": "2025-04-01"
-    },
-    "disputeProjects": [
-        {
-            "__typename": "ClientInvoiceDisputeProject",
-            "id": 37,
-            "projectId": 19158,
-            "disputeAmount": 450,
-            "disputeHours": 30,
-            "disputeType": "Hourly",
-            "disputeReasonCode": "Incorrect Hours Logged",
-            "clientExplanation": "I have a dispute over this expert for the current invoice 175325",
-            "clientDocumentLinks": "https://expert-client-dispute-files.s3.amazonaws.com/project-19158%2Ftesting.pdf,https://expert-client-dispute-files.s3.amazonaws.com/project-19158%2F_Carmelita_Resume-Graduation__1_.docx",
-            "expertDocumentLinks": "https://expert-client-dispute-files.s3.amazonaws.com/project-19158%2F0eb4b31b-b6d8-4cd1-b6ac-39b807ea4577.pdf",
-            "resolutionMode": null,
-            "resolutionType": null,
-            "project": {
-                "__typename": "Project",
-                "name": "Ongoing Ad-Hoc Support",
-                "freelancerRate": null,
-                "clientRate": null,
-                "projectHours": [
-                    {
-                        "__typename": "ProjectHour",
-                        "id": 136605,
-                        "date": "2022-02-11",
-                        "description": "Ate Tacos",
-                        "hours": 8
-                    },
-                    {
-                        "__typename": "ProjectHour",
-                        "id": 136606,
-                        "date": "2022-02-12",
-                        "description": "Worked on project analysis",
-                        "hours": 6
-                    },
-                    {
-                        "__typename": "ProjectHour",
-                        "id": 136607,
-                        "date": "2022-02-13",
-                        "description": "Client meeting and documentation",
-                        "hours": 4
-                    },
-                    {
-                        "__typename": "ProjectHour",
-                        "id": 136608,
-                        "date": "2022-02-14",
-                        "description": "Code review and testing",
-                        "hours": 7
-                    },
-                    {
-                        "__typename": "ProjectHour",
-                        "id": 136609,
-                        "date": "2022-02-15",
-                        "description": "Final deliverable preparation",
-                        "hours": 5
-                    }
-                ]
-            }
-        }
-    ],
-    "lastMessageAt": "2025-05-23T10:56:53.000Z",
-    "messageCount": 5,
-    "client": {
-        "__typename": "Client",
-        "name": "Vessel Advisors"
-    }
-};
-const testUser = {
-    userId: 29005,
-    firstName: "Test",
-    lastName: "User"
-};
-const TestDecisionSection = () => {
-    const mockOnUpdateDispute = (variables) => __awaiter(void 0, void 0, void 0, function* () {
-        console.log('Mock update dispute called with:', variables);
-        return Promise.resolve({ success: true });
-    });
-    const mockUpdateInvoiceMutation = {};
-    return (react_1.default.createElement("div", { className: "p-8 max-w-4xl mx-auto" },
-        react_1.default.createElement("h1", { className: "text-2xl font-bold mb-6" }, "Test Decision Section with Hours Modal"),
-        react_1.default.createElement(DecisionSection_1.DecisionSection, { dispute: testDispute, onUpdateDispute: mockOnUpdateDispute, updateInvoiceMutation: mockUpdateInvoiceMutation, user: testUser })));
-};
-exports.TestDecisionSection = TestDecisionSection;
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TestDecisionSection = void 0;
+const react_1 = __importDefault(require("react"));
+const DecisionSection_1 = require("./DecisionSection");
+// Test data from the provided JSON
+const testDispute = {
+    "__typename": "ClientInvoiceDispute",
+    "disputeId": 35,
+    "approvedAmount": 450,
+    "chatEnabled": true,
+    "disputeDate": "2025-05-22",
+    "disputeUpdatedDate": "2025-05-23",
+    "freelancerId": 8081,
+    "freelancer": {
+        "__typename": "User",
+        "id": 8081,
+        "email": "andpande@gmail.com",
+        "firstName": "William",
+        "lastName": "Annon"
+    },
+    "status": "Resolved",
+    "finalDecisionOwnerId": 29005,
+    "invoice": {
+        "__typename": "ClientInvoice",
+        "amount": 450,
+        "balanceDue": 450,
+        "clientId": 4433,
+        "dateGenerated": "2025-04-14",
+        "id": 175325,
+        "month": "2025-04-01"
+    },
+    "disputeProjects": [
+        {
+            "__typename": "ClientInvoiceDisputeProject",
+            "id": 37,
+            "projectId": 19158,
+            "disputeAmount": 450,
+            "disputeHours": 30,
+            "disputeType": "Hourly",
+            "disputeReasonCode": "Incorrect Hours Logged",
+            "clientExplanation": "I have a dispute over this expert for the current invoice 175325",
+            "clientDocumentLinks": "https://expert-client-dispute-files.s3.amazonaws.com/project-19158%2Ftesting.pdf,https://expert-client-dispute-files.s3.amazonaws.com/project-19158%2F_Carmelita_Resume-Graduation__1_.docx",
+            "expertDocumentLinks": "https://expert-client-dispute-files.s3.amazonaws.com/project-19158%2F0eb4b31b-b6d8-4cd1-b6ac-39b807ea4577.pdf",
+            "resolutionMode": null,
+            "resolutionType": null,
+            "project": {
+                "__typename": "Project",
+                "name": "Ongoing Ad-Hoc Support",
+                "freelancerRate": null,
+                "clientRate": null,
+                "projectHours": [
+                    {
+                        "__typename": "ProjectHour",
+                        "id": 136605,
+                        "date": "2022-02-11",
+                        "description": "Ate Tacos",
+                        "hours": 8
+                    },
+                    {
+                        "__typename": "ProjectHour",
+                        "id": 136606,
+                        "date": "2022-02-12",
+                        "description": "Worked on project analysis",
+                        "hours": 6
+                    },
+                    {
+                        "__typename": "ProjectHour",
+                        "id": 136607,
+                        "date": "2022-02-13",
+                        "description": "Client meeting and documentation",
+                        "hours": 4
+                    },
+                    {
+                        "__typename": "ProjectHour",
+                        "id": 136608,
+                        "date": "2022-02-14",
+                        "description": "Code review and testing",
+                        "hours": 7
+                    },
+                    {
+                        "__typename": "ProjectHour",
+                        "id": 136609,
+                        "date": "2022-02-15",
+                        "description": "Final deliverable preparation",
+                        "hours": 5
+                    }
+                ]
+            }
+        }
+    ],
+    "lastMessageAt": "2025-05-23T10:56:53.000Z",
+    "messageCount": 5,
+    "client": {
+        "__typename": "Client",
+        "name": "Vessel Advisors"
+    }
+};
+const testUser = {
+    userId: 29005,
+    firstName: "Test",
+    lastName: "User"
+};
+const TestDecisionSection = () => {
+    const mockOnUpdateDispute = (variables) => __awaiter(void 0, void 0, void 0, function* () {
+        console.log('Mock update dispute called with:', variables);
+        return Promise.resolve({ success: true });
+    });
+    const mockUpdateInvoiceMutation = {};
+    return (react_1.default.createElement("div", { className: "p-8 max-w-4xl mx-auto" },
+        react_1.default.createElement("h1", { className: "text-2xl font-bold mb-6" }, "Test Decision Section with Hours Modal"),
+        react_1.default.createElement(DecisionSection_1.DecisionSection, { dispute: testDispute, onUpdateDispute: mockOnUpdateDispute, updateInvoiceMutation: mockUpdateInvoiceMutation, user: testUser })));
+};
+exports.TestDecisionSection = TestDecisionSection;

package/lib/components/OrganizationChart/OrganizationChart.d.ts

@@ -1,15 +1,15 @@
-interface OrgChartProps {
-    openModal: boolean;
-    setOpenModal: (openModal: boolean) => void;
-    expertFirms: any;
-    firstName: string;
-    lastName: string;
-    imageUrl?: string;
-    primaryServiceLine: string;
-    city: string;
-    stateAbbreviation: string;
-    paroTenure?: string;
-    isPublicProfile?: boolean;
-}
-export declare const OrganizationChart: ({ openModal, setOpenModal, expertFirms, firstName, lastName, imageUrl, primaryServiceLine, city, stateAbbreviation, paroTenure, isPublicProfile }: OrgChartProps) => JSX.Element;
-export {};
+interface OrgChartProps {
+    openModal: boolean;
+    setOpenModal: (openModal: boolean) => void;
+    expertFirms: any;
+    firstName: string;
+    lastName: string;
+    imageUrl?: string;
+    primaryServiceLine: string;
+    city: string;
+    stateAbbreviation: string;
+    paroTenure?: string;
+    isPublicProfile?: boolean;
+}
+export declare const OrganizationChart: ({ openModal, setOpenModal, expertFirms, firstName, lastName, imageUrl, primaryServiceLine, city, stateAbbreviation, paroTenure, isPublicProfile }: OrgChartProps) => JSX.Element;
+export {};