@paro.io/expert-shared-components 1.12.32 → 1.12.33

package/lib/components/ExpertProfileHeader/ProfileSection.js

@@ -121,6 +121,15 @@ const ProfileSection = ({ legacyFreelancerId, imageUrl, shouldAllowEditProfile,
                             " Reviews")))),
             react_1.default.createElement(core_1.Box, { mt: 1, mb: 1 },
                 react_1.default.createElement(core_1.Divider, null))),
+        react_1.default.createElement(core_1.Box, { ml: 1, display: "flex", justifyContent: "space-between", alignItems: "center", "data-testid": "Matching-Id", style: { marginRight: '10px' } },
+            react_1.default.createElement(core_1.Typography, { variant: "body2" }, "Paro Tenure"),
+            react_1.default.createElement("b", null, paroTenure.length > 0 ? paroTenure : "N/A")),
+        react_1.default.createElement(core_1.Box, { ml: 1, mt: 1, display: "flex", justifyContent: "space-between", alignItems: "center", "data-testid": "Matching-Id", style: { marginRight: '10px' } },
+            react_1.default.createElement(core_1.Typography, { variant: "body2" }, isInternal ? 'Hourly Expert Rate' : 'Hourly Rate'),
+            react_1.default.createElement("b", null, hourlyRate > 0 ? `$ ${hourlyRate.toLocaleString()}` : "N/A")),
+        isInternal && react_1.default.createElement(core_1.Box, { ml: 1, mt: 1, display: "flex", justifyContent: "space-between", alignItems: "center", "data-testid": "Matching-Id", style: { marginRight: '10px' } },
+            react_1.default.createElement(core_1.Typography, { variant: "body2" }, "Hourly Client Rate"),
+            react_1.default.createElement("b", null, hourlyRate > 0 ? `$ ${(hourlyRate * 2).toLocaleString()}` : "N/A")),
         react_1.default.createElement(core_1.Box, { mt: 2, mb: 1 }),
         (rates === null || rates === void 0 ? void 0 : rates.length) > 0 && (react_1.default.createElement(react_1.default.Fragment, null,
             react_1.default.createElement(core_1.Grid, { item: true, container: true, direction: 'row', justifyContent: 'space-evenly' },

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

@@ -6,7 +6,6 @@ interface DecisionSectionProps {
     getClientInvoiceSummaryByMonth: any;
     invoiceSummary: any;
     updateClientInvoiceDisputeMutation: any;
-    addClientCredit: any;
 }
-export declare const DecisionSection: ({ dispute, onUpdateDispute, updateInvoiceMutation, updateClientInvoiceDisputeMutation, invoiceSummary, user, getClientInvoiceSummaryByMonth, addClientCredit }: DecisionSectionProps) => JSX.Element;
+export declare const DecisionSection: ({ dispute, onUpdateDispute, updateInvoiceMutation, updateClientInvoiceDisputeMutation, invoiceSummary, user, getClientInvoiceSummaryByMonth, }: DecisionSectionProps) => JSX.Element;
 export {};

package/lib/components/Invoices/DecisionSection.js

@@ -42,15 +42,14 @@ const RESOLUTION_OPTIONS = [
     { value: 'DECLINED', label: 'Decline Dispute' },
     { value: 'PARTIAL', label: 'Partial Approval' },
 ];
-const DecisionSection = ({ dispute, onUpdateDispute, updateInvoiceMutation, updateClientInvoiceDisputeMutation, invoiceSummary, user, getClientInvoiceSummaryByMonth, addClientCredit }) => {
-    var _a, _b, _c, _d;
+const DecisionSection = ({ dispute, onUpdateDispute, updateInvoiceMutation, updateClientInvoiceDisputeMutation, invoiceSummary, user, getClientInvoiceSummaryByMonth, }) => {
+    var _a, _b;
     const totalDisputeHours = (_a = dispute === null || dispute === void 0 ? void 0 : dispute.disputeProjects) === null || _a === void 0 ? void 0 : _a.reduce((acc, project) => acc + (project === null || project === void 0 ? void 0 : project.disputeHours), 0);
     const [resolution, setResolution] = (0, react_1.useState)('');
     const [approvedHours, setApprovedHours] = (0, react_1.useState)(totalDisputeHours);
     const [projectApprovedHours, setProjectApprovedHours] = (0, react_1.useState)({});
     const [isSubmitting, setIsSubmitting] = (0, react_1.useState)(false);
     const [showHoursModal, setShowHoursModal] = (0, react_1.useState)(false);
-    const isDisputePaid = ((_b = dispute === null || dispute === void 0 ? void 0 : dispute.invoice) === null || _b === void 0 ? void 0 : _b.clientInvoiceStatusId) === 4 || ((_c = dispute === null || dispute === void 0 ? void 0 : dispute.invoice) === null || _c === void 0 ? void 0 : _c.clientInvoiceStatusId) === 8;
     // Initialize project approved hours when resolution changes to PARTIAL
     const handleResolutionChange = (newResolution) => {
         var _a;
@@ -85,6 +84,7 @@ const DecisionSection = ({ dispute, onUpdateDispute, updateInvoiceMutation, upda
     const handleApproveClick = () => {
         if (!resolution)
             return;
+        // Show modal for PARTIAL or APPROVED resolutions regardless of dispute type
         if (resolution === 'PARTIAL' || resolution === 'APPROVED') {
             setShowHoursModal(true);
         }
@@ -100,13 +100,19 @@ const DecisionSection = ({ dispute, onUpdateDispute, updateInvoiceMutation, upda
         var _a, _b, _c;
         setIsSubmitting(true);
         try {
+            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
+            }))) || [];
             let calculatedApprovedAmount = 0;
-            const fullDisputeAmount = (_a = dispute === null || dispute === void 0 ? void 0 : dispute.disputeProjects) === null || _a === void 0 ? void 0 : _a.reduce((acc, project) => acc + project.disputeAmount, 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 {
-                (_b = dispute === null || dispute === void 0 ? void 0 : dispute.disputeProjects) === null || _b === void 0 ? void 0 : _b.forEach((project) => {
+                (_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') {
@@ -118,50 +124,6 @@ const DecisionSection = ({ dispute, onUpdateDispute, updateInvoiceMutation, upda
                     }
                 });
             }
-            if (submissionData) {
-                if (isDisputePaid) {
-                    yield addClientCredit({
-                        variables: {
-                            input: {
-                                clientId: submissionData.clientId,
-                                amount: calculatedApprovedAmount,
-                                description: `Credit from Dispute #${dispute.disputeId} - Invoice #${dispute.invoice.id}`,
-                                updatedDate: new Date().toISOString()
-                            }
-                        }
-                    });
-                }
-                else {
-                    yield updateInvoiceMutation({
-                        variables: {
-                            input: submissionData.input,
-                            clientId: submissionData.clientId,
-                            invoiceId: submissionData.invoiceId,
-                            dateGenerated: submissionData.dateGenerated,
-                            updateDescription: submissionData.updateDescription,
-                            freelancerIds: submissionData.freelancerIds
-                        }
-                    });
-                }
-            }
-            let resolutionType;
-            if (isDisputePaid) {
-                resolutionType = 'FutureCredit';
-            }
-            else if (resolution === 'APPROVED') {
-                resolutionType = 'Upheld';
-            }
-            else if (resolution === 'PARTIAL') {
-                resolutionType = 'Reduced';
-            }
-            else {
-                resolutionType = 'Canceled';
-            }
-            const disputeProjectUpdates = ((_c = dispute === null || dispute === void 0 ? void 0 : dispute.disputeProjects) === null || _c === void 0 ? void 0 : _c.map((project) => ({
-                projectId: project.projectId,
-                resolutionMode: 'Direct',
-                resolutionType: resolutionType
-            }))) || [];
             const updateData = {
                 disputeId: dispute.disputeId,
                 status: "Resolved",
@@ -169,17 +131,24 @@ const DecisionSection = ({ dispute, onUpdateDispute, updateInvoiceMutation, upda
                 finalDecisionOwnerId: (user === null || user === void 0 ? void 0 : user.userId) || null,
                 projectDisputes: disputeProjectUpdates
             };
+            if (submissionData) {
+                yield updateInvoiceMutation({
+                    variables: {
+                        input: submissionData.input,
+                        clientId: submissionData.clientId,
+                        invoiceId: submissionData.invoiceId,
+                        dateGenerated: submissionData.dateGenerated,
+                        updateDescription: submissionData.updateDescription,
+                        freelancerIds: submissionData.freelancerIds
+                    }
+                });
+            }
             yield onUpdateDispute({
                 variables: {
                     input: updateData,
                 },
             });
-            if (isDisputePaid) {
-                (0, utils_1.showToast)('success', `Future credit applied: $${calculatedApprovedAmount} to Client ${dispute.client.name}'s balance`);
-            }
-            else {
-                (0, utils_1.showToast)('success', 'Thank you for resolving the dispute. The invoice has been updated with the new hours.');
-            }
+            (0, utils_1.showToast)('success', 'Thank you for resolving the dispute. The invoice has been updated with the new hours.');
         }
         catch (error) {
             console.error('Failed to update dispute:', error);
@@ -189,7 +158,7 @@ const DecisionSection = ({ dispute, onUpdateDispute, updateInvoiceMutation, upda
             setIsSubmitting(false);
         }
     });
-    const isPartialWithMultipleProjects = resolution === 'PARTIAL' && ((_d = dispute === null || dispute === void 0 ? void 0 : dispute.disputeProjects) === null || _d === void 0 ? void 0 : _d.length) > 0;
+    const isPartialWithMultipleProjects = resolution === 'PARTIAL' && ((_b = dispute === null || dispute === void 0 ? void 0 : dispute.disputeProjects) === null || _b === void 0 ? void 0 : _b.length) > 0;
     const isValidPartialApproval = () => {
         if (resolution !== 'PARTIAL')
             return true;

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

@@ -13,7 +13,7 @@ interface InvoiceCardProps {
     isClient?: boolean;
     bucketName?: string;
     reactAppUrl?: string;
-    addClientCredit?: any;
+    isLateDisputeAllowed?: boolean;
 }
-export declare const InvoiceCard: ({ clientInvoice, createDisputeChatMessage, user, chatMessages, updateClientInvoiceDisputeMutation, updateInvoiceMutation, getClientInvoiceSummaryByMonth, invoiceSummary, documentUploadUrl, downloadDocumentUrl, isInternal, isClient, bucketName, reactAppUrl, addClientCredit }: InvoiceCardProps) => JSX.Element;
+export declare const InvoiceCard: ({ clientInvoice, createDisputeChatMessage, user, chatMessages, updateClientInvoiceDisputeMutation, updateInvoiceMutation, getClientInvoiceSummaryByMonth, invoiceSummary, documentUploadUrl, downloadDocumentUrl, isInternal, isClient, bucketName, reactAppUrl, isLateDisputeAllowed, }: InvoiceCardProps) => JSX.Element;
 export {};

package/lib/components/Invoices/InvoiceCard.js

@@ -34,29 +34,25 @@ const DisputeSection_1 = require("./DisputeSection");
 const DiscussionSection_1 = require("./DiscussionSection");
 const DecisionSection_1 = require("./DecisionSection");
 const ClientDisputeProjectCard_1 = require("./ClientDisputeProjectCard");
-const InvoiceCard = ({ clientInvoice, createDisputeChatMessage, user, chatMessages, updateClientInvoiceDisputeMutation, updateInvoiceMutation, getClientInvoiceSummaryByMonth, invoiceSummary, documentUploadUrl, downloadDocumentUrl, isInternal = false, isClient = false, bucketName, reactAppUrl, addClientCredit }) => {
-    var _a;
-    const envUrl = reactAppUrl === null || reactAppUrl === void 0 ? void 0 : reactAppUrl.split('.')[1];
-    const rolesUrl = `https://app.${envUrl}.io/roles`;
+const InvoiceCard = ({ clientInvoice, createDisputeChatMessage, user, chatMessages, updateClientInvoiceDisputeMutation, updateInvoiceMutation, getClientInvoiceSummaryByMonth, invoiceSummary, documentUploadUrl, downloadDocumentUrl, isInternal = false, isClient = false, bucketName, reactAppUrl, isLateDisputeAllowed = false, }) => {
     const [currentInvoice, setCurrentInvoice] = (0, react_1.useState)(clientInvoice);
     (0, react_1.useEffect)(() => {
         setCurrentInvoice(clientInvoice);
     }, [clientInvoice]);
     const disputeId = currentInvoice === null || currentInvoice === void 0 ? void 0 : currentInvoice.disputeId;
-    const hasDisputeAdminRole = (_a = user === null || user === void 0 ? void 0 : user[rolesUrl]) === null || _a === void 0 ? void 0 : _a.includes('disputes_admin');
     return (react_1.default.createElement(base_ui_1.Card, { className: "w-full bg-white rounded-lg shadow-sm overflow-hidden mb-4" },
         react_1.default.createElement(core_1.Accordion, null,
             react_1.default.createElement(core_1.AccordionSummary, { expandIcon: react_1.default.createElement(base_icons_1.IconChevronDown, null), "aria-controls": "invoice-content", id: "invoice-header" },
                 react_1.default.createElement(InvoiceHeader_1.InvoiceHeader, { invoice: currentInvoice, isInternal: isInternal, isClient: isClient })),
             react_1.default.createElement(core_1.AccordionDetails, null,
                 react_1.default.createElement("div", { className: "p-6 space-y-6 w-full" },
-                    react_1.default.createElement(InvoiceDetails_1.InvoiceDetails, { invoice: currentInvoice, isInternal: isInternal, isClient: isClient, reactAppUrl: reactAppUrl }),
+                    react_1.default.createElement(InvoiceDetails_1.InvoiceDetails, { invoice: currentInvoice, isInternal: isInternal, isClient: isClient, reactAppUrl: reactAppUrl, isLateDisputeAllowed: isLateDisputeAllowed }),
                     isInternal ?
                         react_1.default.createElement(DisputeSection_1.DisputeSection, { dispute: currentInvoice, documentUploadUrl: documentUploadUrl, updateClientInvoiceDisputeMutation: updateClientInvoiceDisputeMutation, downloadDocumentUrl: downloadDocumentUrl, bucketName: bucketName })
                         :
                             react_1.default.createElement(ClientDisputeProjectCard_1.ClientDisputeProjectCard, { clientInvoice: currentInvoice, updateClientInvoiceDisputeMutation: updateClientInvoiceDisputeMutation, documentUploadUrl: documentUploadUrl, downloadDocumentUrl: downloadDocumentUrl, bucketName: bucketName }),
                     (currentInvoice === null || currentInvoice === void 0 ? void 0 : currentInvoice.chatEnabled) && disputeId && (react_1.default.createElement(DiscussionSection_1.DiscussionSection, { disputeId: disputeId, currentUser: user, messages: chatMessages, onCreateMessage: createDisputeChatMessage, isInternal: isInternal })),
-                    isInternal && hasDisputeAdminRole &&
-                        react_1.default.createElement(DecisionSection_1.DecisionSection, { dispute: currentInvoice, onUpdateDispute: updateClientInvoiceDisputeMutation, updateInvoiceMutation: updateInvoiceMutation, updateClientInvoiceDisputeMutation: updateClientInvoiceDisputeMutation, invoiceSummary: invoiceSummary, user: user, getClientInvoiceSummaryByMonth: getClientInvoiceSummaryByMonth, addClientCredit: addClientCredit }))))));
+                    isInternal &&
+                        react_1.default.createElement(DecisionSection_1.DecisionSection, { dispute: currentInvoice, onUpdateDispute: updateClientInvoiceDisputeMutation, updateInvoiceMutation: updateInvoiceMutation, updateClientInvoiceDisputeMutation: updateClientInvoiceDisputeMutation, invoiceSummary: invoiceSummary, user: user, getClientInvoiceSummaryByMonth: getClientInvoiceSummaryByMonth }))))));
 };
 exports.InvoiceCard = InvoiceCard;

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

@@ -3,8 +3,9 @@ interface InvoiceDetailsProps {
     isInternal: boolean;
     isClient: boolean;
     reactAppUrl?: string;
+    isLateDisputeAllowed?: boolean;
 }
 export declare const getStatusColor: (status: string) => "success" | "primary" | "info" | "warning";
 export declare const getStatusText: (status: string) => "" | "Resolved" | "In Progress" | "Under Review";
-export declare const InvoiceDetails: ({ invoice, isInternal, isClient, reactAppUrl }: InvoiceDetailsProps) => JSX.Element;
+export declare const InvoiceDetails: ({ invoice, isInternal, isClient, reactAppUrl, isLateDisputeAllowed }: InvoiceDetailsProps) => JSX.Element;
 export {};

package/lib/components/Invoices/InvoiceDetails.js

@@ -34,15 +34,15 @@ const getStatusText = (status) => {
     }
 };
 exports.getStatusText = getStatusText;
-const InvoiceDetails = ({ invoice, isInternal = false, isClient = false, reactAppUrl = 'https://internal.parodev.io' }) => {
+const InvoiceDetails = ({ invoice, isInternal = false, isClient = false, reactAppUrl = 'https://internal.parodev.io', isLateDisputeAllowed = false }) => {
     var _a, _b, _c, _d, _e, _f, _g;
     const clientInvoiceUrl = `${reactAppUrl}/invoices/${(_a = invoice === null || invoice === void 0 ? void 0 : invoice.invoice) === null || _a === void 0 ? void 0 : _a.id}?month=${(_b = invoice === null || invoice === void 0 ? void 0 : invoice.invoice) === null || _b === void 0 ? void 0 : _b.month}&companyId=${(_c = invoice === null || invoice === void 0 ? void 0 : invoice.invoice) === null || _c === void 0 ? void 0 : _c.clientId}`;
     const internalInvoiceUrl = `${reactAppUrl}/client/${(_d = invoice === null || invoice === void 0 ? void 0 : invoice.invoice) === null || _d === void 0 ? void 0 : _d.clientId}/invoices/${(_e = invoice === null || invoice === void 0 ? void 0 : invoice.invoice) === null || _e === void 0 ? void 0 : _e.id}?month=${(_f = invoice === null || invoice === void 0 ? void 0 : invoice.invoice) === null || _f === void 0 ? void 0 : _f.month}`;
     const today = (0, dayjs_1.default)();
     const firstDayOfMonth = (0, dayjs_1.default)().startOf('month');
-    const disputeDaysLeft = 14 - today.diff(firstDayOfMonth, 'day');
+    const disputeDaysLeft = isLateDisputeAllowed ? 14 - today.diff(firstDayOfMonth, 'day') : 7 - today.diff(firstDayOfMonth, 'day');
     const daysLeft = disputeDaysLeft > 0;
-    const editableDate = (0, dayjs_1.default)().date(14).format("MMM DD");
+    const editableDate = (0, dayjs_1.default)().date(isLateDisputeAllowed ? 14 : 7).format("MMM DD");
     return (react_1.default.createElement("div", { className: "space-y-6" },
         react_1.default.createElement("div", { className: "flex items-center space-x-4" },
             react_1.default.createElement(base_ui_1.Tag, { color: (0, exports.getStatusColor)(invoice === null || invoice === void 0 ? void 0 : invoice.status), label: (0, exports.getStatusText)(invoice === null || invoice === void 0 ? void 0 : invoice.status), borderRadius: "full", variant: "subtle" }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paro.io/expert-shared-components",
-  "version": "1.12.32",
+  "version": "1.12.33",
   "description": "",
   "main": "lib/index.js",
   "scripts": {