npm - @paro.io/expert-shared-components - Versions diffs - 1.13.10 → 1.13.11 - Mend

@paro.io/expert-shared-components 1.13.10 → 1.13.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

package/lib/components/Escalations/AccountSuspensionModal.js CHANGED Viewed

@@ -42,12 +42,12 @@ const AccountSuspensionModal = ({ showSuspensionModal, onClose }) => {
                                 react_1.default.createElement("div", { className: "flex justify-between items-start mb-2" },
                                     react_1.default.createElement("h4", { className: "font-semibold text-orange-800" }, "Level 2: Medium Severity"),
                                     react_1.default.createElement("div", { className: "text-xs bg-orange-100 text-orange-700 px-2 py-1 rounded-full" }, "3 Warnings System")),
-                                react_1.default.createElement("p", { className: "text-sm text-gray-600 mb-2" },
-                                    react_1.default.createElement("span", { className: "font-medium text-orange-800" }, "After 3 warnings: 30-day suspension"),
-                                    " + mandatory retraining before reinstatement"),
-                                react_1.default.createElement("div", { className: "text-xs text-gray-500" },
-                                    react_1.default.createElement("strong", null, "Examples:"),
-                                    " Poor client communication, missed project deadlines, quality concerns, repeated light violations"))),
+                                react_1.default.createElement("p", { className: "text-sm mb-2 font-medium text-red-800" }, "After 3 warnings: 30-day suspension"),
+                                react_1.default.createElement("div", null,
+                                    react_1.default.createElement("b", null, "Note: "),
+                                    "Warnings are counted within this level, not as a total. Suspension is triggered after 3 warnings at this severity. ",
+                                    react_1.default.createElement("b", null, "After 3 warnings in this level:"),
+                                    " 30-day suspension"))),
                         react_1.default.createElement("div", { className: "flex items-start" },
                             react_1.default.createElement("div", { className: "bg-red-500 rounded-full p-2 mr-4 relative z-10" },
                                 react_1.default.createElement(base_icons_1.IconExclamation, { className: "h-5 w-5 text-white" })),
@@ -55,12 +55,12 @@ const AccountSuspensionModal = ({ showSuspensionModal, onClose }) => {
                                 react_1.default.createElement("div", { className: "flex justify-between items-start mb-2" },
                                     react_1.default.createElement("h4", { className: "font-semibold text-red-800" }, "Level 3: High Severity"),
                                     react_1.default.createElement("div", { className: "text-xs bg-red-100 text-red-700 px-2 py-1 rounded-full" }, "2 Warnings System")),
-                                react_1.default.createElement("p", { className: "text-sm text-gray-600 mb-2" },
-                                    react_1.default.createElement("span", { className: "font-medium text-red-800" }, "After 2 warnings: 60-day suspension"),
-                                    " + comprehensive retraining required"),
-                                react_1.default.createElement("div", { className: "text-xs text-gray-500" },
-                                    react_1.default.createElement("strong", null, "Examples:"),
-                                    " Significant project failures, client relationship damage, contract violations, repeated medium violations"))),
+                                react_1.default.createElement("p", { className: "text-sm mb-2 font-medium text-red-800" }, "After 2 warnings: 60-day suspension"),
+                                react_1.default.createElement("div", null,
+                                    react_1.default.createElement("b", null, "Note: "),
+                                    "Warnings are counted within this level, not as a total. Suspension is triggered after 2 warnings at this severity. ",
+                                    react_1.default.createElement("b", null, "After 2 warnings in this level:"),
+                                    " 60-day suspension"))),
                         react_1.default.createElement("div", { className: "flex items-start" },
                             react_1.default.createElement("div", { className: "bg-black rounded-full p-2 mr-4 relative z-10" },
                                 react_1.default.createElement(base_icons_1.IconX, { className: "h-5 w-5 text-white" })),
@@ -68,45 +68,21 @@ const AccountSuspensionModal = ({ showSuspensionModal, onClose }) => {
                                 react_1.default.createElement("div", { className: "flex justify-between items-start mb-2" },
                                     react_1.default.createElement("h4", { className: "font-semibold text-gray-900" }, "Level 4: Critical Severity"),
                                     react_1.default.createElement("div", { className: "text-xs bg-gray-800 text-white px-2 py-1 rounded-full" }, "One Time Offense")),
-                                react_1.default.createElement("p", { className: "text-sm text-gray-600 mb-2" },
-                                    react_1.default.createElement("span", { className: "font-medium text-gray-900" }, "Immediate permanent suspension and account removal")),
-                                react_1.default.createElement("div", { className: "text-xs text-gray-500" },
-                                    react_1.default.createElement("strong", null, "Examples:"),
-                                    " Project abandonment, terms of service violations, non-circumvention breaches, fraudulent activity, severe misconduct"))))),
-                react_1.default.createElement("div", { className: "mt-6 bg-blue-50 rounded-lg p-4" },
-                    react_1.default.createElement("h4", { className: "font-medium text-blue-900 mb-2" }, "Progressive Warning System"),
-                    react_1.default.createElement("div", { className: "space-y-3" },
-                        react_1.default.createElement("div", { className: "flex items-center text-sm" },
-                            react_1.default.createElement("div", { className: "w-3 h-3 bg-yellow-400 rounded-full mr-3" }),
-                            react_1.default.createElement("span", null,
-                                react_1.default.createElement("strong", null, "Medium (3 warnings):"),
-                                " Expert coaching and performance improvement plan")),
-                        react_1.default.createElement("div", { className: "flex items-center text-sm" },
-                            react_1.default.createElement("div", { className: "w-3 h-3 bg-orange-500 rounded-full mr-3" }),
-                            react_1.default.createElement("span", null,
-                                react_1.default.createElement("strong", null, "High (2 warnings):"),
-                                " Escalated coaching with enhanced monitoring")),
-                        react_1.default.createElement("div", { className: "flex items-center text-sm" },
-                            react_1.default.createElement("div", { className: "w-3 h-3 bg-red-500 rounded-full mr-3" }),
-                            react_1.default.createElement("span", null,
-                                react_1.default.createElement("strong", null, "Final warning:"),
-                                " Automatic suspension with mandatory training")),
-                        react_1.default.createElement("div", { className: "flex items-center text-sm" },
-                            react_1.default.createElement("div", { className: "w-3 h-3 bg-black rounded-full mr-3" }),
-                            react_1.default.createElement("span", null,
-                                react_1.default.createElement("strong", null, "Critical offense:"),
-                                " Immediate permanent account removal")),
-                        react_1.default.createElement("div", { className: "flex items-center text-sm" },
-                            react_1.default.createElement("div", { className: "w-3 h-3 bg-gray-400 rounded-full mr-3" }),
-                            react_1.default.createElement("span", null,
-                                react_1.default.createElement("strong", null, "Reset:"),
-                                " Warnings reset after 6 months of good standing")))),
+                                react_1.default.createElement("p", { className: "text-sm mb-2 font-medium text-red-800" }, "Permanent suspension"),
+                                react_1.default.createElement("div", null,
+                                    react_1.default.createElement("b", null, "Note: "),
+                                    "Warnings are counted within this level, not as a total. Suspension is triggered after 1 warning at this severity. ",
+                                    react_1.default.createElement("b", null, "After 1 warning in this level"),
+                                    ": Permentant suspension")))),
+                    react_1.default.createElement("div", { className: "text-xs" },
+                        react_1.default.createElement("b", null, "\u26A0\uFE0F Suspension thresholds are based on the number of warnings within each severity level, not total warnings across all levels"))),
                 react_1.default.createElement("div", { className: "mt-6 bg-gray-50 rounded-lg p-4" },
                     react_1.default.createElement("h4", { className: "font-medium text-gray-900 mb-2" }, "Important Reminders"),
                     react_1.default.createElement("ul", { className: "text-sm text-gray-600 space-y-1" },
-                        react_1.default.createElement("li", null, "\u2022 All issues are tracked and contribute to your warning count"),
-                        react_1.default.createElement("li", null, "\u2022 Training completion is required before suspension can be lifted"),
-                        react_1.default.createElement("li", null, "\u2022 Warnings are cumulative across all severity levels"),
-                        react_1.default.createElement("li", null, "\u2022 All actions are logged and affect your expert rating")))))));
+                        react_1.default.createElement("li", null,
+                            "\u2022 Warnings are tracked separately per severity level. Suspensions are triggered only when the threshold is met ",
+                            react_1.default.createElement("b", null, "within a specific level"),
+                            " (e.g., 3 Medium-level warnings = Medium suspension)"),
+                        react_1.default.createElement("li", null, "\u2022 Warnings reset after 6 months of good standing (no new warnings)")))))));
 };
 exports.default = AccountSuspensionModal;

package/lib/components/Escalations/EscalationChat.js CHANGED Viewed

@@ -43,7 +43,7 @@ const EscalationRespondForm_1 = require("./EscalationRespondForm");
 const utils_1 = require("../shared/utils");
 const EscalationChat = ({ activeChatIssue, showEscalationChat, onClose, user, createEscalationChatMessage, documentUploadUrl, bucketName, uploadExpertClientFiles, updateProjectEscalation, isExpert, }) => {
     var _a, _b;
-    const [uploadFiles, setUploadFiles] = (0, react_1.useState)([]);
+    const [uploadFiles, setUploadFiles] = (0, react_1.useState)([activeChatIssue.expertSupportingDocuments, activeChatIssue.clientSupportingDocuments, activeChatIssue.internalSupportingDocuments]);
     const [uploadingFile, setUploadingFile] = (0, react_1.useState)(false);
     const fileInputRef = (0, react_1.useRef)(null);
     const handleFileUpload = (event) => __awaiter(void 0, void 0, void 0, function* () {
@@ -63,7 +63,7 @@ const EscalationChat = ({ activeChatIssue, showEscalationChat, onClose, user, cr
             }
             const uploadPromises = validFiles.map((selectedFile) => {
                 return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
-                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
                     try {
                         const res = yield (0, FileUploader_1.fileUploader)({
                             file: selectedFile,
@@ -73,21 +73,21 @@ const EscalationChat = ({ activeChatIssue, showEscalationChat, onClose, user, cr
                             projectId: activeChatIssue.projectDetails.length > 0 ? activeChatIssue.projectDetails[0].projectId : '',
                             documentUploadUrl: documentUploadUrl,
                             bucketName: bucketName,
-                            previousFiles: isExpert ? activeChatIssue === null || activeChatIssue === void 0 ? void 0 : activeChatIssue.clientDocumentLinks : activeChatIssue === null || activeChatIssue === void 0 ? void 0 : activeChatIssue.expertDocumentlinks,
+                            previousFiles: isExpert ? (_b = (_a = activeChatIssue === null || activeChatIssue === void 0 ? void 0 : activeChatIssue.expertSupportingDocuments) === null || _a === void 0 ? void 0 : _a.split(',')) !== null && _b !== void 0 ? _b : [] : (_d = (_c = activeChatIssue === null || activeChatIssue === void 0 ? void 0 : activeChatIssue.clientSupportingDocuments) === null || _c === void 0 ? void 0 : _c.split(',')) !== null && _d !== void 0 ? _d : [],
                             isExpert: isExpert,
                             uploadExpertClientFiles: uploadExpertClientFiles,
                             updateProjectEscalation: updateProjectEscalation,
                             extraData: {
-                                clientId: (_b = (_a = activeChatIssue === null || activeChatIssue === void 0 ? void 0 : activeChatIssue.client) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : 0,
-                                clientName: (_d = (_c = activeChatIssue === null || activeChatIssue === void 0 ? void 0 : activeChatIssue.client) === null || _c === void 0 ? void 0 : _c.name) !== null && _d !== void 0 ? _d : '',
-                                email: isExpert ? (_g = (_f = (_e = activeChatIssue === null || activeChatIssue === void 0 ? void 0 : activeChatIssue.client) === null || _e === void 0 ? void 0 : _e.primaryContact) === null || _f === void 0 ? void 0 : _f.email) !== null && _g !== void 0 ? _g : '' : (_j = (_h = activeChatIssue === null || activeChatIssue === void 0 ? void 0 : activeChatIssue.freelancer) === null || _h === void 0 ? void 0 : _h.email) !== null && _j !== void 0 ? _j : '',
-                                freelancerId: (_l = (_k = activeChatIssue === null || activeChatIssue === void 0 ? void 0 : activeChatIssue.freelancer) === null || _k === void 0 ? void 0 : _k.id) !== null && _l !== void 0 ? _l : 0,
-                                freelancerName: (_o = (_m = activeChatIssue === null || activeChatIssue === void 0 ? void 0 : activeChatIssue.freelancer) === null || _m === void 0 ? void 0 : _m.name) !== null && _o !== void 0 ? _o : '',
+                                clientId: (_f = (_e = activeChatIssue === null || activeChatIssue === void 0 ? void 0 : activeChatIssue.client) === null || _e === void 0 ? void 0 : _e.id) !== null && _f !== void 0 ? _f : 0,
+                                clientName: (_h = (_g = activeChatIssue === null || activeChatIssue === void 0 ? void 0 : activeChatIssue.client) === null || _g === void 0 ? void 0 : _g.name) !== null && _h !== void 0 ? _h : '',
+                                email: isExpert ? (_l = (_k = (_j = activeChatIssue === null || activeChatIssue === void 0 ? void 0 : activeChatIssue.client) === null || _j === void 0 ? void 0 : _j.primaryContact) === null || _k === void 0 ? void 0 : _k.email) !== null && _l !== void 0 ? _l : '' : (_o = (_m = activeChatIssue === null || activeChatIssue === void 0 ? void 0 : activeChatIssue.freelancer) === null || _m === void 0 ? void 0 : _m.email) !== null && _o !== void 0 ? _o : '',
+                                freelancerId: (_q = (_p = activeChatIssue === null || activeChatIssue === void 0 ? void 0 : activeChatIssue.freelancer) === null || _p === void 0 ? void 0 : _p.id) !== null && _q !== void 0 ? _q : 0,
+                                freelancerName: (_s = (_r = activeChatIssue === null || activeChatIssue === void 0 ? void 0 : activeChatIssue.freelancer) === null || _r === void 0 ? void 0 : _r.name) !== null && _s !== void 0 ? _s : '',
                                 projectName: activeChatIssue.projectDetails.length > 0 ? activeChatIssue.projectDetails[0].projectName : '',
                             }
                         });
                         if (res) {
-                            setUploadFiles(prev => [...prev, ...res]);
+                            setUploadFiles([...res]);
                         }
                         resolve();
                     }
@@ -103,11 +103,9 @@ const EscalationChat = ({ activeChatIssue, showEscalationChat, onClose, user, cr
         }
         finally {
             setUploadingFile(false);
-            setUploadFiles([]);
         }
     });
-    const docs = [activeChatIssue.expertSupportingDocuments, activeChatIssue.clientSupportingDocuments, activeChatIssue.internalSupportingDocuments, ...uploadFiles];
-    const processedDocs = (0, utils_1.processDocs)(docs);
+    const processedDocs = (0, utils_1.processDocs)(uploadFiles);
     const project = activeChatIssue.projectDetails && Array.isArray(activeChatIssue.projectDetails) && activeChatIssue.projectDetails.length > 0
         ? `${(_a = activeChatIssue.projectDetails[0]) === null || _a === void 0 ? void 0 : _a.projectName}${activeChatIssue.projectDetails.length > 1 ? ` +${activeChatIssue.projectDetails.length - 1} more` : ''} `
         : '';

package/lib/components/Escalations/EscalationIssueCard.d.ts CHANGED Viewed

@@ -16,6 +16,7 @@ type EscalationIssueCardProps = {
     downloadDocumentUrl: string;
     bucketName: string;
     userId: number;
+    refetchEscalationDisputeStatistics?: any;
 };
 declare const EscalationIssueCard: React.FC<EscalationIssueCardProps>;
 export default EscalationIssueCard;

package/lib/components/Escalations/EscalationIssueCard.js CHANGED Viewed

@@ -22,6 +22,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+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 };
 };
@@ -35,6 +44,7 @@ const dayjs_1 = __importDefault(require("dayjs"));
 const ViewResponseModal_1 = __importDefault(require("./ViewResponseModal"));
 const MarkResolvedModal_1 = __importDefault(require("./MarkResolvedModal"));
 const utils_1 = require("../shared/utils");
+const utils_2 = require("../shared/utils");
 const getBackgroundColor = (type) => {
     switch (type) {
         case 'Critical':
@@ -57,10 +67,11 @@ const CustomTag = ({ label, iconLeft, onClick, customColor, }) => {
         label.toUpperCase()));
 };
 exports.CustomTag = CustomTag;
-const EscalationIssueCard = ({ issues, isExpert, openEscalationChat, showRespondButton = false, setSelectedIssueId, showMarkResolvedButton = false, updateProjectEscalation, downloadDocumentUrl, bucketName, userId, }) => {
+const EscalationIssueCard = ({ issues, isExpert, openEscalationChat, showRespondButton = false, setSelectedIssueId, showMarkResolvedButton = false, updateProjectEscalation, downloadDocumentUrl, bucketName, userId, refetchEscalationDisputeStatistics, }) => {
     var _a, _b;
     const [viewResponseModal, setViewResponseModal] = (0, react_1.useState)(null);
     const [markAsResolved, setMarkAsResolved] = (0, react_1.useState)(null);
+    const [submitting, setSubmitting] = (0, react_1.useState)(false);
     const getResponseButtonText = (issue) => {
         var _a;
         const userTypeId = (_a = issue === null || issue === void 0 ? void 0 : issue.submittedByUser) === null || _a === void 0 ? void 0 : _a.userTypeId;
@@ -85,6 +96,28 @@ const EscalationIssueCard = ({ issues, isExpert, openEscalationChat, showRespond
         }
         return "Awaiting Response";
     };
+    const handleMakeVisibleToExpert = (escalationId) => __awaiter(void 0, void 0, void 0, function* () {
+        setSubmitting(true);
+        try {
+            yield updateProjectEscalation({
+                variables: {
+                    input: {
+                        escalationId: escalationId,
+                        clientEscalationTo: 'both',
+                        statusChangedBy: userId,
+                    }
+                }
+            });
+            (0, utils_2.showToast)("success", "Expert visibility updated Successfully!");
+        }
+        catch (error) {
+            console.error("Failed to update expert visibility for this escalation!", error);
+            (0, utils_2.showToast)("warning", "Failed to update expert visibility!");
+        }
+        finally {
+            setSubmitting(false);
+        }
+    });
     if (!issues.length)
         return react_1.default.createElement("div", null, "No issues.");
     return (react_1.default.createElement("div", { className: "space-y-4" },
@@ -95,7 +128,7 @@ const EscalationIssueCard = ({ issues, isExpert, openEscalationChat, showRespond
                 : '';
             const docs = [issue.expertSupportingDocuments, issue.clientSupportingDocuments, issue.internalSupportingDocuments];
             const processedDocs = (0, utils_1.processDocs)(docs);
-            return (react_1.default.createElement("div", { key: issue.id, className: "border border-gray-200 rounded-lg bg-white p-4" },
+            return (react_1.default.createElement("div", { key: issue.escalationId, className: "border border-gray-200 rounded-lg bg-white p-4" },
                 react_1.default.createElement("div", { className: "flex items-center justify-between mb-3" },
                     react_1.default.createElement("div", { className: "flex-1 ml-2" },
                         react_1.default.createElement("div", { className: "flex flex-row justify-start gap-2" },
@@ -139,9 +172,11 @@ const EscalationIssueCard = ({ issues, isExpert, openEscalationChat, showRespond
                     showRespondButton && setSelectedIssueId && (react_1.default.createElement(base_ui_1.Button, { label: "Respond to Escalation", onClick: () => setSelectedIssueId(issue.escalationNumber), color: 'primary' })),
                     showMarkResolvedButton && (react_1.default.createElement(base_ui_1.Button, { label: getResponseButtonText(issue), onClick: () => { setViewResponseModal(issue); }, color: 'primary', disabled: getResponseButtonText(issue) === 'Awaiting Response' })),
                     showMarkResolvedButton && !isExpert && issue.submittedByUser.userTypeId === 3 && ( // only client can resolve issue raised by client
-                    react_1.default.createElement(base_ui_1.Button, { onClick: () => { setMarkAsResolved(issue); }, label: "Mark as Resolved", color: "primary" })))));
+                    react_1.default.createElement(base_ui_1.Button, { onClick: () => { setMarkAsResolved(issue); }, label: "Mark as Resolved", color: "primary" })),
+                    showMarkResolvedButton && !isExpert && issue.submittedByUser.userTypeId === 3 && issue.clientEscalationTo === "paro" && ( // only client can update this, raised by client
+                    react_1.default.createElement(base_ui_1.Button, { onClick: () => handleMakeVisibleToExpert(issue.escalationId), label: "Make visible to expert", color: "primary", isLoading: submitting })))));
         }),
         !!viewResponseModal && react_1.default.createElement(ViewResponseModal_1.default, { selectedIssue: viewResponseModal, isExpert: isExpert, open: !!viewResponseModal, onClose: () => setViewResponseModal(null) }),
-        !!markAsResolved && react_1.default.createElement(MarkResolvedModal_1.default, { escalationId: markAsResolved.escalationId, expertName: (_b = (_a = markAsResolved === null || markAsResolved === void 0 ? void 0 : markAsResolved.freelancer) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : 'Expert', open: !!markAsResolved, onClose: () => setMarkAsResolved(false), updateProjectEscalation: updateProjectEscalation, userId: userId })));
+        !!markAsResolved && react_1.default.createElement(MarkResolvedModal_1.default, { escalationId: markAsResolved.escalationId, expertName: (_b = (_a = markAsResolved === null || markAsResolved === void 0 ? void 0 : markAsResolved.freelancer) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : 'Expert', open: !!markAsResolved, onClose: () => setMarkAsResolved(false), updateProjectEscalation: updateProjectEscalation, userId: userId, refetchEscalationDisputeStatistics: refetchEscalationDisputeStatistics })));
 };
 exports.default = EscalationIssueCard;

package/lib/components/Escalations/EscalationRespondForm.js CHANGED Viewed

@@ -96,7 +96,7 @@ const EscalationRespondForm = ({ goBack, selectedIssue, documentUploadUrl, downl
     const responseTypes = isExpert ? exports.expertResponseTypes : exports.clientResponseTypes;
     const [selectedType, setSelectedType] = (0, react_1.useState)(responseTypes[0].value);
     const [responseInput, setResponseInput] = (0, react_1.useState)('');
-    const [uploadFiles, setUploadFiles] = (0, react_1.useState)([]);
+    const [uploadFiles, setUploadFiles] = (0, react_1.useState)([selectedIssue.expertSupportingDocuments, selectedIssue.clientSupportingDocuments, selectedIssue.internalSupportingDocuments]);
     const [uploadingFile, setUploadingFile] = (0, react_1.useState)(false);
     const [submitting, setSubmitting] = (0, react_1.useState)(false);
     const fileInputRef = (0, react_1.useRef)(null);
@@ -117,7 +117,7 @@ const EscalationRespondForm = ({ goBack, selectedIssue, documentUploadUrl, downl
             }
             const uploadPromises = validFiles.map((selectedFile) => {
                 return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
-                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
                     try {
                         const res = yield (0, FileUploader_1.fileUploader)({
                             file: selectedFile,
@@ -127,21 +127,21 @@ const EscalationRespondForm = ({ goBack, selectedIssue, documentUploadUrl, downl
                             projectId: (_b = (_a = selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.projectDetails) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.projectId,
                             documentUploadUrl: documentUploadUrl,
                             bucketName: bucketName,
-                            previousFiles: isExpert ? selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.clientDocumentLinks : selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.expertDocumentlinks,
+                            previousFiles: isExpert ? (_d = (_c = selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.expertSupportingDocuments) === null || _c === void 0 ? void 0 : _c.split(',')) !== null && _d !== void 0 ? _d : [] : (_f = (_e = selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.clientSupportingDocuments) === null || _e === void 0 ? void 0 : _e.split(',')) !== null && _f !== void 0 ? _f : [],
                             isExpert: isExpert,
                             uploadExpertClientFiles: uploadExpertClientFiles,
                             updateProjectEscalation: updateProjectEscalation,
                             extraData: {
-                                clientId: (_c = selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.client) === null || _c === void 0 ? void 0 : _c.id,
-                                clientName: (_e = (_d = selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.client) === null || _d === void 0 ? void 0 : _d.name) !== null && _e !== void 0 ? _e : '',
-                                email: isExpert ? (_h = (_g = (_f = selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.client) === null || _f === void 0 ? void 0 : _f.primaryContact) === null || _g === void 0 ? void 0 : _g.email) !== null && _h !== void 0 ? _h : '' : (_k = (_j = selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.freelancer) === null || _j === void 0 ? void 0 : _j.email) !== null && _k !== void 0 ? _k : '',
-                                freelancerId: (_l = selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.freelancer) === null || _l === void 0 ? void 0 : _l.id,
-                                freelancerName: (_o = (_m = selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.freelancer) === null || _m === void 0 ? void 0 : _m.name) !== null && _o !== void 0 ? _o : '',
-                                projectName: (_q = (_p = selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.projectDetails) === null || _p === void 0 ? void 0 : _p[0]) === null || _q === void 0 ? void 0 : _q.projectName,
+                                clientId: (_g = selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.client) === null || _g === void 0 ? void 0 : _g.id,
+                                clientName: (_j = (_h = selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.client) === null || _h === void 0 ? void 0 : _h.name) !== null && _j !== void 0 ? _j : '',
+                                email: isExpert ? (_m = (_l = (_k = selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.client) === null || _k === void 0 ? void 0 : _k.primaryContact) === null || _l === void 0 ? void 0 : _l.email) !== null && _m !== void 0 ? _m : '' : (_p = (_o = selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.freelancer) === null || _o === void 0 ? void 0 : _o.email) !== null && _p !== void 0 ? _p : '',
+                                freelancerId: (_q = selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.freelancer) === null || _q === void 0 ? void 0 : _q.id,
+                                freelancerName: (_s = (_r = selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.freelancer) === null || _r === void 0 ? void 0 : _r.name) !== null && _s !== void 0 ? _s : '',
+                                projectName: (_u = (_t = selectedIssue === null || selectedIssue === void 0 ? void 0 : selectedIssue.projectDetails) === null || _t === void 0 ? void 0 : _t[0]) === null || _u === void 0 ? void 0 : _u.projectName,
                             }
                         });
                         if (res) {
-                            setUploadFiles(prev => [...prev, ...res]);
+                            setUploadFiles([...res]);
                         }
                         resolve();
                     }
@@ -157,7 +157,6 @@ const EscalationRespondForm = ({ goBack, selectedIssue, documentUploadUrl, downl
         }
         finally {
             setUploadingFile(false);
-            setUploadFiles([]);
         }
     });
     const submitResponse = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -185,8 +184,7 @@ const EscalationRespondForm = ({ goBack, selectedIssue, documentUploadUrl, downl
             goHome();
         }
     });
-    const docs = [selectedIssue.expertSupportingDocuments, selectedIssue.clientSupportingDocuments, selectedIssue.internalSupportingDocuments, ...uploadFiles];
-    const processedDocs = (0, utils_1.processDocs)(docs);
+    const processedDocs = (0, utils_1.processDocs)(uploadFiles);
     return (react_1.default.createElement("div", null,
         react_1.default.createElement("button", { onClick: goBack, className: "flex items-center text-blue-600 mb-6" },
             react_1.default.createElement(base_icons_1.IconChevronLeft, { size: "xs" }),

package/lib/components/Escalations/EscalationSubmitForm.js CHANGED Viewed

@@ -71,6 +71,7 @@ const EscalationSubmitForm = ({ goBack, goHome, expertsOrClients, projects, docu
     const [issueStartDate, setIssueStartDate] = (0, react_1.useState)((0, dayjs_1.default)(new Date).format('MM-DD-YYYY'));
     const [isDateInvalid, setIsDateInvalid] = (0, react_1.useState)(false);
     const [submitting, setSubmitting] = (0, react_1.useState)(false);
+    const [clientEscalationTo, setClientEscalationTo] = (0, react_1.useState)('');
     const fileInputRef = (0, react_1.useRef)(null);
     const escalationId = (0, utils_1.generateUUID)();
     (0, react_1.useEffect)(() => {
@@ -78,7 +79,7 @@ const EscalationSubmitForm = ({ goBack, goHome, expertsOrClients, projects, docu
             const options = expertsOrClients.map((user) => ({
                 label: user.name,
                 value: { id: user.id, name: user.name },
-            }));
+            })).sort((a, b) => a.label.localeCompare(b.label));
             setExpertOptions(options);
         }
     }, [expertsOrClients]);
@@ -96,7 +97,7 @@ const EscalationSubmitForm = ({ goBack, goHome, expertsOrClients, projects, docu
                 .map((p) => ({
                 label: p.name,
                 value: p,
-            }));
+            })).sort((a, b) => a.label.localeCompare(b.label));
             setProjectOptions(options);
         }
     }, [projects, selectedUser]);
@@ -155,11 +156,12 @@ const EscalationSubmitForm = ({ goBack, goHome, expertsOrClients, projects, docu
         }
         finally {
             setUploadingFile(false);
-            setUploadFiles([]);
         }
     });
     const isFormValid = () => {
         const requiredProjectSelection = isExpert || (!isExpert && selectedProjects.length > 0);
+        const requireEscalationTo = (isExpert || (!isExpert && clientEscalationTo !== ''));
+        console.log({ issueStartDate });
         return (selectedUser !== null &&
             issueType !== '' &&
             severity !== '' &&
@@ -167,27 +169,14 @@ const EscalationSubmitForm = ({ goBack, goHome, expertsOrClients, projects, docu
             outcomeInput.trim() !== '' &&
             isChecked &&
             issueStartDate !== undefined &&
-            requiredProjectSelection);
+            requiredProjectSelection &&
+            requireEscalationTo);
     };
     const handleSubmit = () => __awaiter(void 0, void 0, void 0, function* () {
         if (!isFormValid())
             return;
         setSubmitting(true);
-        const formData = {
-            escalationId: escalationId,
-            freelancerId: isExpert ? user.userId : selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.id,
-            clientId: isExpert ? selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.id : clientId,
-            projectDetails: selectedProjects.filter((p) => p !== undefined).map((p) => { return { projectId: p.id, projectName: p.name }; }),
-            issueStartDate: issueStartDate,
-            escalationType: issueType,
-            severityLevel: severity,
-            problem: problemInput,
-            outcome: outcomeInput,
-            submittedByUserId: user.userId,
-            status: 'InProgress',
-            [isExpert ? 'expertSupportingDocuments' : 'clientSupportingDocuments']: uploadFiles.length > 0 ? uploadFiles.join(", ") : '',
-            statusChangedBy: user.userId,
-        };
+        const formData = Object.assign({ escalationId: escalationId, freelancerId: isExpert ? user.userId : selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.id, clientId: isExpert ? selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.id : clientId, projectDetails: selectedProjects.filter((p) => p !== undefined).map((p) => { return { projectId: p.id, projectName: p.name }; }), issueStartDate: issueStartDate, escalationType: issueType, severityLevel: severity, problem: problemInput, outcome: outcomeInput, submittedByUserId: user.userId, status: 'InProgress', [isExpert ? 'expertSupportingDocuments' : 'clientSupportingDocuments']: uploadFiles.length > 0 ? uploadFiles.join(", ") : '', statusChangedBy: user.userId }, (isExpert ? {} : { clientEscalationTo }));
         try {
             yield createProjectEscalation({
                 variables: {
@@ -241,7 +230,7 @@ const EscalationSubmitForm = ({ goBack, goHome, expertsOrClients, projects, docu
                 react_1.default.createElement("div", { className: "flex items-center gap-x-2" },
                     react_1.default.createElement(EscalationIssueCard_1.CustomTag, { label: "Low" }),
                     react_1.default.createElement("span", null, "Minor issue or inconvenience that does not affect overall project flow.")))),
-        react_1.default.createElement("div", { className: "border rounded-lg overflow-hidden mb-6" },
+        react_1.default.createElement("div", { className: "border rounded-lg overflow-hidden mb-6 mt-4" },
             react_1.default.createElement("div", { className: "bg-gray-50 p-3 border-b" },
                 react_1.default.createElement("h3", { className: "font-medium" }, "Issue Details")),
             react_1.default.createElement("div", { className: "p-4 space-y-4" },
@@ -332,6 +321,13 @@ const EscalationSubmitForm = ({ goBack, goHome, expertsOrClients, projects, docu
                         react_1.default.createElement("input", { ref: fileInputRef, type: "file", multiple: false, accept: ".pdf,.doc,.docx,.jpeg,.png,.gif,.csv, .xslx", hidden: true, onChange: handleFileUpload }),
                         react_1.default.createElement(base_ui_1.Button, { label: "Attach Files", iconLeft: react_1.default.createElement(base_icons_1.IconPlus, { size: "sm" }), onClick: () => { var _a; return (_a = fileInputRef.current) === null || _a === void 0 ? void 0 : _a.click(); }, color: "info", isLoading: uploadingFile, disabled: selectedUser === null, size: "sm" }),
                         uploadFiles.length > 0 && (react_1.default.createElement("ul", { className: "mt-2 text-sm text-gray-600 list-disc list-inside" }, uploadFiles.map(f => react_1.default.createElement("li", { key: f.name }, f.split('%2F')[1])))))),
+                !isExpert && react_1.default.createElement("div", null,
+                    react_1.default.createElement("label", { className: "block text-sm font-medium text-gray-700 mb-1" }, "Initially Address To:"),
+                    react_1.default.createElement(core_1.Select, { fullWidth: true, value: clientEscalationTo, onChange: e => setClientEscalationTo(e.target.value), displayEmpty: true, variant: "outlined", placeholder: "Select party" },
+                        react_1.default.createElement(core_1.MenuItem, { disabled: true, value: "" },
+                            react_1.default.createElement("em", null, "Select party")),
+                        react_1.default.createElement(core_1.MenuItem, { value: "paro" }, "Paro only"),
+                        react_1.default.createElement(core_1.MenuItem, { value: "both" }, "Both Expert And Paro"))),
                 react_1.default.createElement("div", { className: "bg-[#EFF6FF] p-3 rounded" },
                     react_1.default.createElement(base_ui_1.Checkbox, { id: "checkbox-1", label: `I understand this will notify my ${isExpert ? 'client' : 'expert'} and the Paro support team`, name: "acknowledge", isChecked: isChecked, onChange: () => setIsChecked(prev => !prev) })),
                 react_1.default.createElement("div", { className: "flex justify-end space-x-3 pt-4" },

package/lib/components/Escalations/EscalationTabsContent.d.ts CHANGED Viewed

@@ -10,6 +10,7 @@ interface EscalationTabProps {
     downloadDocumentUrl: string;
     bucketName: string;
     userId: number;
+    refetchEscalationDisputeStatistics: any;
 }
-declare const EscalationTabsContent: ({ activeTab, openEscalationChat, setSelectedIssueId, activeIssues, inProgressIssues, resolvedIssues, isExpert, updateProjectEscalation, downloadDocumentUrl, bucketName, userId, }: EscalationTabProps) => JSX.Element;
+declare const EscalationTabsContent: ({ activeTab, openEscalationChat, setSelectedIssueId, activeIssues, inProgressIssues, resolvedIssues, isExpert, updateProjectEscalation, downloadDocumentUrl, bucketName, userId, refetchEscalationDisputeStatistics, }: EscalationTabProps) => JSX.Element;
 export default EscalationTabsContent;

package/lib/components/Escalations/EscalationTabsContent.js CHANGED Viewed

@@ -31,7 +31,7 @@ const EscalationIssueCard_1 = __importStar(require("./EscalationIssueCard"));
 const base_ui_1 = require("@paro.io/base-ui");
 const dayjs_1 = __importDefault(require("dayjs"));
 ;
-const EscalationTabsContent = ({ activeTab, openEscalationChat, setSelectedIssueId, activeIssues, inProgressIssues, resolvedIssues, isExpert, updateProjectEscalation, downloadDocumentUrl, bucketName, userId, }) => {
+const EscalationTabsContent = ({ activeTab, openEscalationChat, setSelectedIssueId, activeIssues, inProgressIssues, resolvedIssues, isExpert, updateProjectEscalation, downloadDocumentUrl, bucketName, userId, refetchEscalationDisputeStatistics, }) => {
     if (activeTab === 'action-required') {
         return (react_1.default.createElement("div", null,
             react_1.default.createElement("div", { className: "flex items-center justify-between mb-4" },
@@ -42,7 +42,7 @@ const EscalationTabsContent = ({ activeTab, openEscalationChat, setSelectedIssue
         return (react_1.default.createElement("div", null,
             react_1.default.createElement("div", { className: "flex items-center justify-between mb-4" },
                 react_1.default.createElement("h3", { className: "text-lg font-semibold text-gray-900" }, "Issues In Progress")),
-            react_1.default.createElement(EscalationIssueCard_1.default, { issues: inProgressIssues, isExpert: isExpert, openEscalationChat: openEscalationChat, showMarkResolvedButton: true, updateProjectEscalation: updateProjectEscalation, downloadDocumentUrl: downloadDocumentUrl, bucketName: bucketName, userId: userId })));
+            react_1.default.createElement(EscalationIssueCard_1.default, { issues: inProgressIssues, isExpert: isExpert, openEscalationChat: openEscalationChat, showMarkResolvedButton: true, updateProjectEscalation: updateProjectEscalation, downloadDocumentUrl: downloadDocumentUrl, bucketName: bucketName, userId: userId, refetchEscalationDisputeStatistics: refetchEscalationDisputeStatistics })));
     }
     if (activeTab === 'resolved') {
         return (react_1.default.createElement("div", null,
@@ -80,6 +80,10 @@ const EscalationTabsContent = ({ activeTab, openEscalationChat, setSelectedIssue
                                     react_1.default.createElement("span", { className: "font-bold" }, "Resolution:"),
                                     " ",
                                     issue.internalResolution ? issue.internalResolution : issue.clientResolution),
+                                react_1.default.createElement("div", { className: "text-sm text-gray-600 mb-2" },
+                                    react_1.default.createElement("span", { className: "font-bold" }, "Expert at Fault: "),
+                                    " ",
+                                    issue.isExpertAtFault ? "True" : "False"),
                                 react_1.default.createElement("div", { className: "flex items-center text-sm text-gray-600 mb-2" },
                                     react_1.default.createElement("span", { className: "text-xs text-gray-500" },
                                         "Resolved: ",

package/lib/components/Escalations/Escalations.d.ts CHANGED Viewed

@@ -13,6 +13,7 @@ interface EscalationsProps {
     user: any;
     clientId?: number;
     escalationDisputeStatistics?: any;
+    refetchEscalationDisputeStatistics?: any;
 }
-export declare const Escalations: ({ expertsOrClients, projects, isExpert, escalations, documentUploadUrl, downloadDocumentUrl, uploadExpertClientFiles, createProjectEscalation, updateProjectEscalation, createEscalationChatMessage, bucketName, user, clientId, escalationDisputeStatistics, }: EscalationsProps) => JSX.Element;
+export declare const Escalations: ({ expertsOrClients, projects, isExpert, escalations, documentUploadUrl, downloadDocumentUrl, uploadExpertClientFiles, createProjectEscalation, updateProjectEscalation, createEscalationChatMessage, bucketName, user, clientId, escalationDisputeStatistics, refetchEscalationDisputeStatistics, }: EscalationsProps) => JSX.Element;
 export {};

package/lib/components/Escalations/Escalations.js CHANGED Viewed

@@ -40,7 +40,7 @@ const AccountSuspensionModal_1 = __importDefault(require("./AccountSuspensionMod
 const base_icons_1 = require("@paro.io/base-icons");
 const EscalationIssueCard_1 = require("./EscalationIssueCard");
 const react_hot_toast_1 = require("react-hot-toast");
-const Escalations = ({ expertsOrClients, projects, isExpert = false, escalations, documentUploadUrl, downloadDocumentUrl, uploadExpertClientFiles, createProjectEscalation, updateProjectEscalation, createEscalationChatMessage, bucketName, user, clientId = 0, escalationDisputeStatistics, }) => {
+const Escalations = ({ expertsOrClients, projects, isExpert = false, escalations, documentUploadUrl, downloadDocumentUrl, uploadExpertClientFiles, createProjectEscalation, updateProjectEscalation, createEscalationChatMessage, bucketName, user, clientId = 0, escalationDisputeStatistics, refetchEscalationDisputeStatistics, }) => {
     const [activeSection, setActiveSection] = (0, react_1.useState)('support');
     const [selectedProject, setSelectedProject] = (0, react_1.useState)(null);
     const [selectedIssueId, setSelectedIssueId] = (0, react_1.useState)(null); // using selectedIssueId 0 for new escalation submission
@@ -50,21 +50,34 @@ const Escalations = ({ expertsOrClients, projects, isExpert = false, escalations
     const [showSuspensionModal, setShowSuspensionModal] = (0, react_1.useState)(false);
     const activeIssues = escalations.filter(issue => {
         var _a;
-        const userTypeId = (_a = issue === null || issue === void 0 ? void 0 : issue.submittedByUser) === null || _a === void 0 ? void 0 : _a.userTypeId;
+        const submittedUserTypeId = (_a = issue === null || issue === void 0 ? void 0 : issue.submittedByUser) === null || _a === void 0 ? void 0 : _a.userTypeId;
         const internalEscalationTo = issue === null || issue === void 0 ? void 0 : issue.internalEscalationTo;
         const status = issue === null || issue === void 0 ? void 0 : issue.status;
-        const isDifferentUserType = userTypeId !== user.userTypeId;
+        const isDifferentUserType = submittedUserTypeId !== user.userTypeId;
         const isPendingResponse = isExpert
             ? issue.expertResponse === null
             : issue.clientResponse === null;
-        const isValidInternalEscalation = userTypeId === 2
-            ? (isExpert
+        // Determine if the escalation is valid for the current user
+        let isValidEscalation = false;
+        if (submittedUserTypeId === 2) {
+            // Submitted by internal
+            isValidEscalation = isExpert
                 ? internalEscalationTo !== "client" // expert should NOT see escalations to client
-                : internalEscalationTo !== "expert") // client should NOT see escalations to expert
-            : userTypeId !== user.userTypeId;
+                : internalEscalationTo !== "expert"; // client should NOT see escalations to expert
+        }
+        else if (submittedUserTypeId === 3) {
+            // Submitted by client
+            isValidEscalation = isExpert
+                ? (issue === null || issue === void 0 ? void 0 : issue.clientEscalationTo) !== 'paro'
+                : submittedUserTypeId !== user.userTypeId;
+        }
+        else {
+            // Submitted by expert
+            isValidEscalation = submittedUserTypeId !== user.userTypeId;
+        }
         const shouldInclude = isDifferentUserType &&
             isPendingResponse &&
-            isValidInternalEscalation &&
+            isValidEscalation &&
             status === 'InProgress';
         return shouldInclude;
     });
@@ -160,7 +173,7 @@ const Escalations = ({ expertsOrClients, projects, isExpert = false, escalations
                 !isExpert &&
                     react_1.default.createElement(EscalationReportBanner_1.default, { onReport: () => setSelectedIssueId(0), isExpert: isExpert }),
                 escalations.length > 0 ? react_1.default.createElement(EscalationTabs_1.default, { activeTab: activeEscalationTab, setActiveTab: setActiveEscalationTab, activeIssues: activeIssues.length, inProgressIssues: inProgressIssues.length, resolvedIssues: resolvedIssues.length }) : null,
-                react_1.default.createElement(EscalationTabsContent_1.default, { activeTab: activeEscalationTab, openEscalationChat: openEscalationChat, setSelectedIssueId: setSelectedIssueId, activeIssues: activeIssues, inProgressIssues: inProgressIssues, resolvedIssues: resolvedIssues, updateProjectEscalation: updateProjectEscalation, isExpert: isExpert, downloadDocumentUrl: downloadDocumentUrl, bucketName: bucketName, userId: user.userId })),
+                react_1.default.createElement(EscalationTabsContent_1.default, { activeTab: activeEscalationTab, openEscalationChat: openEscalationChat, setSelectedIssueId: setSelectedIssueId, activeIssues: activeIssues, inProgressIssues: inProgressIssues, resolvedIssues: resolvedIssues, updateProjectEscalation: updateProjectEscalation, isExpert: isExpert, downloadDocumentUrl: downloadDocumentUrl, bucketName: bucketName, userId: user.userId, refetchEscalationDisputeStatistics: refetchEscalationDisputeStatistics })),
             activeSection === 'support' && activeIssues.filter((issue) => issue.escalationNumber === selectedIssueId).length > 0 && (react_1.default.createElement(EscalationRespondForm_1.default, { goBack: goBack, selectedIssue: activeIssues.find((issue) => issue.escalationNumber === selectedIssueId), documentUploadUrl: documentUploadUrl, downloadDocumentUrl: downloadDocumentUrl, bucketName: bucketName, uploadExpertClientFiles: uploadExpertClientFiles, updateProjectEscalation: updateProjectEscalation, goHome: goHome, isExpert: isExpert, userId: user.userId })),
             activeSection === 'support' && selectedIssueId === 0 && (react_1.default.createElement(EscalationSubmitForm_1.default, { goBack: goBack, goHome: goHome, expertsOrClients: expertsOrClients, projects: projects, documentUploadUrl: documentUploadUrl, bucketName: bucketName, uploadExpertClientFiles: uploadExpertClientFiles, createProjectEscalation: createProjectEscalation, isExpert: isExpert, user: user, clientId: clientId })),
             showEscalationChat && activeChatIssue && (react_1.default.createElement(EscalationChat_1.default, { activeChatIssue: activeChatIssue, showEscalationChat: showEscalationChat, onClose: () => {

package/lib/components/Escalations/MarkResolvedModal.d.ts CHANGED Viewed

@@ -1,10 +1,11 @@
 import React from 'react';
-declare const MarkResolvedModal: ({ escalationId, expertName, open, onClose, updateProjectEscalation, userId, }: {
+declare const MarkResolvedModal: ({ escalationId, expertName, open, onClose, updateProjectEscalation, userId, refetchEscalationDisputeStatistics, }: {
     escalationId: string;
     expertName: string;
     open: boolean;
     onClose: () => void;
     updateProjectEscalation: any;
     userId: number;
+    refetchEscalationDisputeStatistics?: any;
 }) => React.JSX.Element;
 export default MarkResolvedModal;

package/lib/components/Escalations/MarkResolvedModal.js CHANGED Viewed

@@ -37,7 +37,7 @@ const base_icons_1 = require("@paro.io/base-icons");
 const base_ui_1 = require("@paro.io/base-ui");
 const core_1 = require("@material-ui/core");
 const utils_1 = require("../shared/utils");
-const MarkResolvedModal = ({ escalationId, expertName, open, onClose, updateProjectEscalation, userId, }) => {
+const MarkResolvedModal = ({ escalationId, expertName, open, onClose, updateProjectEscalation, userId, refetchEscalationDisputeStatistics, }) => {
     const [resolutionText, setResolutionText] = (0, react_1.useState)(null);
     const [submitting, setSubmitting] = (0, react_1.useState)(false);
     const [expertResponsibility, setExpertResponsibility] = (0, react_1.useState)('');
@@ -53,7 +53,9 @@ const MarkResolvedModal = ({ escalationId, expertName, open, onClose, updateProj
                         statusChangedBy: userId,
                         isExpertAtFault: expertResponsibility === 'atFault' ? true : false,
                     }
-                }
+                },
+            }).then(() => {
+                refetchEscalationDisputeStatistics && refetchEscalationDisputeStatistics();
             });
             (0, utils_1.showToast)("success", "Issue marked as resolved. You can now find it in the `Resolved` section");
         }
@@ -80,23 +82,22 @@ const MarkResolvedModal = ({ escalationId, expertName, open, onClose, updateProj
             react_1.default.createElement("div", { className: "mt-6 mb-4" },
                 react_1.default.createElement("label", { className: "block text-sm font-medium text-gray-700 mb-1" }, "Please provide additional details before marking this issue as resolved."),
                 react_1.default.createElement(base_ui_1.Input, { type: "text", value: resolutionText, placeholder: "Enter details here...", onChange: (e) => setResolutionText(e.target.value) })),
-            react_1.default.createElement("p", null, "Please provide additional details before marking this issue as resolved."),
             react_1.default.createElement("div", { style: { marginTop: '1em', marginBottom: '1em' } },
-                react_1.default.createElement("label", { className: "block text-sm font-normal mb-1" },
+                react_1.default.createElement("label", { className: "block text-sm font-medium text-gray-700 mb-1" },
                     "Expert Responsibility ",
                     react_1.default.createElement("span", { className: "text-sm text-red-800" }, "*")),
                 react_1.default.createElement("div", null,
-                    react_1.default.createElement("label", null,
+                    react_1.default.createElement("label", { className: "flex items-center space-x-2" },
                         react_1.default.createElement("input", { type: "radio", name: "expertResponsibility", value: "atFault", checked: expertResponsibility === 'atFault', onChange: () => setExpertResponsibility('atFault'), required: true }),
-                        "Expert is at fault for this issue")),
+                        react_1.default.createElement("span", null, "Expert is at fault for this issue"))),
                 react_1.default.createElement("div", null,
-                    react_1.default.createElement("label", null,
+                    react_1.default.createElement("label", { className: "flex items-center space-x-2" },
                         react_1.default.createElement("input", { type: "radio", name: "expertResponsibility", value: "notAtFault", checked: expertResponsibility === 'notAtFault', onChange: () => setExpertResponsibility('notAtFault'), required: true }),
-                        "Expert is NOT at fault"))),
+                        react_1.default.createElement("span", null, "Expert is NOT at fault for this issue")))),
             react_1.default.createElement("div", { className: "flex items-center justify-between" },
                 react_1.default.createElement("div", { className: "flex space-x-2" },
                     react_1.default.createElement(base_ui_1.Button, { label: "Cancel", onClick: onClose, disabled: submitting })),
                 react_1.default.createElement("div", { className: "flex space-x-2" },
-                    react_1.default.createElement(base_ui_1.Button, { label: "Submit", color: "primary", onClick: handleSubmit, isLoading: submitting, disabled: expertResponsibility === '' }))))));
+                    react_1.default.createElement(base_ui_1.Button, { label: "Submit", color: "primary", onClick: handleSubmit, isLoading: submitting, disabled: expertResponsibility === '' || resolutionText === '' }))))));
 };
 exports.default = MarkResolvedModal;

package/lib/components/FileUploader/index.d.ts CHANGED Viewed

@@ -11,7 +11,7 @@ interface UploadFileParams {
     updateProjectEscalation?: any;
     uploadExpertClientFiles?: any;
     createProjectEscalation?: any;
-    previousFiles?: string | string[];
+    previousFiles?: string | string[] | [];
     isExpert: boolean;
     extraData?: {
         clientId: number;

package/package.json CHANGED Viewed

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