npm - @paro.io/expert-shared-components - Versions diffs - 1.12.41 → 1.12.43 - Mend

@paro.io/expert-shared-components 1.12.41 → 1.12.43

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 (26) hide show

package/lib/components/Escalations/EscalationSubmitForm.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 };
 };
@@ -32,6 +41,9 @@ const base_ui_1 = require("@paro.io/base-ui");
 const core_1 = require("@material-ui/core");
 const LogTimeModalAuthenticated_1 = require("../ProjectCard/LogTimeModalAuthenticated");
 const dayjs_1 = __importDefault(require("dayjs"));
+const EscalationRespondForm_1 = require("./EscalationRespondForm");
+const FileUploader_1 = require("../FileUploader");
+const utils_1 = require("../shared/utils");
 const issueTypeOptions = [
     { value: 'CommunicationIssues', label: 'Communication Issues' },
     { value: 'Professionalism', label: 'Professionalism' },
@@ -41,80 +53,158 @@ const issueTypeOptions = [
     { value: 'ScopeCreep', label: 'Scope Creep/Unauthorized Requests' },
     { value: 'Other', label: 'Other' },
 ];
-const EscalationSubmitForm = ({ goBack, goHome, experts, projects, isExpert = false }) => {
+const EscalationSubmitForm = ({ goBack, goHome, expertsOrClients, projects, documentUploadUrl, bucketName, uploadExpertClientFiles, createProjectEscalation, isExpert = false, user }) => {
+    var _a;
     const [isChecked, setIsChecked] = (0, react_1.useState)(false);
     const [problemInput, setProblemInput] = (0, react_1.useState)('');
     const [outcomeInput, setOutcomeInput] = (0, react_1.useState)('');
     const [uploadFiles, setUploadFiles] = (0, react_1.useState)([]);
     const [uploadingFile, setUploadingFile] = (0, react_1.useState)(false);
     const [expertOptions, setExpertOptions] = (0, react_1.useState)([]);
-    const [selectedExpert, setSelectedExpert] = (0, react_1.useState)(null);
+    const [selectedUser, setSelectedUser] = (0, react_1.useState)(null);
     const [projectOptions, setProjectOptions] = (0, react_1.useState)([]);
     const [selectedProjects, setSelectedProjects] = (0, react_1.useState)([]);
     const [issueType, setIssueType] = (0, react_1.useState)('');
     const [severity, setSeverity] = (0, react_1.useState)('');
-    const [startDate, setStartDate] = (0, react_1.useState)(undefined);
+    const [issueStartDate, setIssueStartDate] = (0, react_1.useState)(undefined);
     const [isDateInvalid, setIsDateInvalid] = (0, react_1.useState)(false);
+    const [submitting, setSubmitting] = (0, react_1.useState)(false);
     const fileInputRef = (0, react_1.useRef)(null);
+    const escalationId = (0, utils_1.generateUUID)();
     (0, react_1.useEffect)(() => {
-        if (experts && experts.length > 0) {
-            const options = experts.map((expert) => ({
-                label: isExpert ? expert.name : expert.freelancerName,
-                value: isExpert ? expert.id : expert.freelancerId,
+        if (expertsOrClients && expertsOrClients.length > 0) {
+            const options = expertsOrClients.map((user) => ({
+                label: user.name,
+                value: { id: user.id, name: user.name },
             }));
             setExpertOptions(options);
         }
-    }, [experts]);
+    }, [expertsOrClients]);
     (0, react_1.useEffect)(() => {
         if (projects && projects.length > 0) {
             const options = projects
                 .filter((p) => {
                 if (isExpert) {
-                    return p.client.id === Number(selectedExpert);
+                    return p.client.id === Number(selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.id);
                 }
                 else {
-                    return p.freelancer.id === Number(selectedExpert);
+                    return p.freelancer.id === Number(selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.id);
                 }
             })
                 .map((p) => ({
-                label: isExpert ? p.name : p.name,
-                value: isExpert ? p : p,
+                label: p.name,
+                value: p,
             }));
             setProjectOptions(options);
         }
-    }, [projects, selectedExpert]);
-    const handleFileUpload = (event) => {
-        const files = Array.from(event.target.files);
-        setUploadFiles(prev => [...prev, ...files]);
-    };
+    }, [projects, selectedUser]);
+    const handleFileUpload = (event) => __awaiter(void 0, void 0, void 0, function* () {
+        const selectedFiles = event.target.files;
+        if (!selectedFiles)
+            return;
+        setUploadingFile(true);
+        const validFileNames = Array.from(selectedFiles)
+            .filter(file => (0, EscalationRespondForm_1.validateFileUpload)(file))
+            .map(file => file.name);
+        if (validFileNames.length === 0)
+            return;
+        if (validFileNames && validFileNames.length > 0) {
+            const uploadPromises = Array.from(selectedFiles).map((selectedFile) => {
+                return new Promise((resolve, reject) => {
+                    const reader = new FileReader();
+                    reader.onloadend = () => __awaiter(void 0, void 0, void 0, function* () {
+                        try {
+                            const res = yield (0, FileUploader_1.fileUploader)({
+                                file: selectedFile,
+                                documentName: selectedFile.name,
+                                escalationId: escalationId,
+                                projectId: selectedProjects.length > 0 ? selectedProjects[0].id : '',
+                                documentUploadUrl: documentUploadUrl,
+                                bucketName: bucketName,
+                                isExpert: false,
+                                uploadExpertClientFiles: uploadExpertClientFiles,
+                                createProjectEscalation: createProjectEscalation,
+                                extraData: {
+                                    clientId: isExpert ? selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.id : user === null || user === void 0 ? void 0 : user.userId,
+                                    clientName: isExpert ? selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.name : user === null || user === void 0 ? void 0 : user.name,
+                                    email: isExpert ? "client@gmail.com" : user === null || user === void 0 ? void 0 : user.email,
+                                    freelancerId: isExpert ? user === null || user === void 0 ? void 0 : user.userId : selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.id,
+                                    freelancerName: isExpert ? user === null || user === void 0 ? void 0 : user.name : selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.name,
+                                    projectName: selectedProjects.length > 0 ? selectedProjects[0].name : '',
+                                }
+                            });
+                            if (res) {
+                                setUploadFiles(prev => [...prev, ...res]);
+                            }
+                        }
+                        catch (error) {
+                            reject(error);
+                        }
+                        finally {
+                            resolve();
+                        }
+                    });
+                    reader.readAsDataURL(selectedFile);
+                });
+            });
+            try {
+                const res = yield Promise.all(uploadPromises);
+            }
+            catch (error) {
+                console.error('Error uploading files:', error);
+            }
+            finally {
+                setUploadingFile(false);
+            }
+        }
+        ;
+    });
     const isFormValid = () => {
         const requiredProjectSelection = isExpert || (!isExpert && selectedProjects.length > 0);
-        return (selectedExpert !== null &&
+        return (selectedUser !== null &&
             issueType !== '' &&
             severity !== '' &&
             problemInput.trim() !== '' &&
             outcomeInput.trim() !== '' &&
             isChecked &&
-            startDate !== undefined &&
+            issueStartDate !== undefined &&
             requiredProjectSelection);
     };
-    const handleSubmit = () => {
+    const handleSubmit = () => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         if (!isFormValid())
             return;
+        setSubmitting(true);
         const formData = {
-            selectedExpert,
-            selectedProjects,
-            issueType,
-            severity,
-            startDate,
+            escalationId: escalationId,
+            freelancerId: user.userId,
+            clientId: (_a = selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.id) !== null && _a !== void 0 ? _a : 0,
+            projectDetails: selectedProjects.map((p) => { return { projectId: p.id, projectName: p.name }; }),
+            issueStartDate: issueStartDate,
+            escalationType: issueType,
+            severityLevel: severity,
             problem: problemInput,
-            expectedOutcome: outcomeInput,
-            supportingDocs: uploadFiles.map(f => f.name),
+            outcome: outcomeInput,
+            submittedByUserId: user.userId,
+            status: 'InProgress',
+            [isExpert ? 'expertSupportingDocuments' : 'clientSupportingDocuments']: uploadFiles.join(", "),
+            statusChangedBy: user.userId,
         };
-        console.log('Escalation Submitted:', formData);
-        // Redirect or perform additional logic
-        goHome();
-    };
+        try {
+            yield createProjectEscalation({
+                variables: {
+                    input: formData
+                }
+            });
+        }
+        catch (error) {
+            console.error("Failed to create an escalation!", error);
+        }
+        finally {
+            setSubmitting(false);
+            goHome();
+        }
+    });
     const validateDate = (date) => {
         const minDate = LogTimeModalAuthenticated_1.constants.MIN_DATE;
         const maxDate = new Date();
@@ -146,10 +236,19 @@ const EscalationSubmitForm = ({ goBack, goHome, experts, projects, isExpert = fa
             react_1.default.createElement("div", { className: "p-4 space-y-4" },
                 react_1.default.createElement("div", null,
                     react_1.default.createElement("label", { className: "block text-sm font-medium text-gray-700 mb-1" }, `Which ${isExpert ? 'client' : 'expert'} are you experiencing the issue with?`),
-                    react_1.default.createElement(core_1.Select, { fullWidth: true, value: selectedExpert !== null && selectedExpert !== void 0 ? selectedExpert : '', onChange: e => setSelectedExpert(e.target.value === '' ? null : Number(e.target.value)), displayEmpty: true, variant: "outlined", placeholder: `Select a ${isExpert ? 'Client' : 'Expert'}` },
+                    react_1.default.createElement(core_1.Select, { fullWidth: true, value: (_a = selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.name) !== null && _a !== void 0 ? _a : '', onChange: e => {
+                            const selectedName = e.target.value;
+                            if (selectedName === '') {
+                                setSelectedUser(null);
+                            }
+                            else {
+                                const selectedOption = expertOptions.find(opt => opt.value.name === selectedName);
+                                setSelectedUser(selectedOption ? selectedOption.value : null);
+                            }
+                        }, displayEmpty: true, variant: "outlined", placeholder: `Select a ${isExpert ? 'Client' : 'Expert'}` },
                         react_1.default.createElement(core_1.MenuItem, { disabled: true, value: "" },
                             react_1.default.createElement("em", null, `Select a ${isExpert ? 'Client' : 'Expert'}`)),
-                        expertOptions.map(option => (react_1.default.createElement(core_1.MenuItem, { key: option.value, value: option.value }, option.label))))),
+                        expertOptions.map(option => (react_1.default.createElement(core_1.MenuItem, { key: option.value.id, value: option.value.name }, option.label))))),
                 react_1.default.createElement("div", null,
                     react_1.default.createElement("label", { className: "block text-sm font-medium text-gray-700 mb-1" }, "Which Project(s)?"),
                     react_1.default.createElement(core_1.Select, { multiple: true, fullWidth: true, value: selectedProjects, onChange: (e) => {
@@ -166,7 +265,7 @@ const EscalationSubmitForm = ({ goBack, goHome, experts, projects, isExpert = fa
                         }, placeholder: `Select a Project(s)` },
                         react_1.default.createElement(core_1.MenuItem, { disabled: true, value: "" },
                             react_1.default.createElement("em", null, "Select a Project(s)...")),
-                        projectOptions.map(option => (react_1.default.createElement(core_1.MenuItem, { key: option.value, value: option.value }, option.label))))),
+                        projectOptions.map(option => (react_1.default.createElement(core_1.MenuItem, { key: option.value.id, value: option.value }, option.label))))),
                 react_1.default.createElement("div", { className: "grid grid-cols-1 md:grid-cols-2 gap-4" },
                     react_1.default.createElement("div", null,
                         react_1.default.createElement("label", { className: "block text-sm font-medium text-gray-700 mb-1" }, "Issue Type"),
@@ -194,7 +293,7 @@ const EscalationSubmitForm = ({ goBack, goHome, experts, projects, isExpert = fa
                             react_1.default.createElement(core_1.MenuItem, { value: "Low" }, "Low")))),
                 react_1.default.createElement("div", null,
                     react_1.default.createElement("label", { className: "block text-sm font-medium text-gray-700 mb-1" }, "When did this issue start?"),
-                    react_1.default.createElement(LogTimeModalAuthenticated_1.SelectDate, { timeLogDate: startDate, setTimeLogDate: setStartDate, isInvalid: false, setIsDateInvalid: setIsDateInvalid, validateDate: validateDate, maxDate: (0, dayjs_1.default)(new Date()).format("MM-DD-YYYY") })),
+                    react_1.default.createElement(LogTimeModalAuthenticated_1.SelectDate, { timeLogDate: issueStartDate, setTimeLogDate: setIssueStartDate, isInvalid: false, setIsDateInvalid: setIsDateInvalid, validateDate: validateDate, maxDate: (0, dayjs_1.default)(new Date()).format("MM-DD-YYYY") })),
                 react_1.default.createElement("div", null,
                     react_1.default.createElement("label", { className: "block text-sm font-medium text-gray-700 mb-1" }, "What's the problem?"),
                     react_1.default.createElement(base_ui_1.Input, { type: "text", value: problemInput, placeholder: "Describe the issue...", onChange: (e) => setProblemInput(e.target.value) })),
@@ -206,12 +305,12 @@ const EscalationSubmitForm = ({ goBack, goHome, experts, projects, isExpert = fa
                     react_1.default.createElement("div", { className: "border border-dashed border-gray-300 rounded-md p-6 text-center" },
                         react_1.default.createElement("p", { className: "text-sm text-gray-600 mb-2" }, "Upload screenshots, emails, or documents"),
                         react_1.default.createElement("input", { ref: fileInputRef, type: "file", multiple: true, accept: ".pdf,.doc,.docx,.jpeg,.png,.gif,.csv", 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, 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.name)))))),
+                        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])))))),
                 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" },
-                    react_1.default.createElement(base_ui_1.Button, { label: "Cancel", onClick: goBack }),
-                    react_1.default.createElement(base_ui_1.Button, { label: "Submit issue", onClick: handleSubmit, color: "primary", disabled: !isFormValid() }))))));
+                    react_1.default.createElement(base_ui_1.Button, { label: "Cancel", onClick: goBack, disabled: submitting || uploadingFile }),
+                    react_1.default.createElement(base_ui_1.Button, { label: "Submit issue", onClick: handleSubmit, color: "primary", isLoading: submitting, disabled: !isFormValid() || uploadingFile }))))));
 };
 exports.default = EscalationSubmitForm;

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

@@ -1,17 +1,14 @@
-export type EscalationChatDetails = {
-    title: string;
-    project: string;
-    id: string;
-    status: string;
-};
 interface EscalationTabProps {
     activeTab: string;
-    openEscalationChat: (details: EscalationChatDetails) => void;
+    openEscalationChat: (issue: any) => void;
     setSelectedIssueId: (issue: number) => void;
     activeIssues: any[];
     inProgressIssues: any[];
     resolvedIssues: any[];
     isExpert: boolean;
+    updateProjectEscalation: any;
+    downloadDocumentUrl: string;
+    bucketName: string;
 }
-declare const EscalationTabsContent: ({ activeTab, openEscalationChat, setSelectedIssueId, activeIssues, inProgressIssues, resolvedIssues, isExpert, }: EscalationTabProps) => JSX.Element;
+declare const EscalationTabsContent: ({ activeTab, openEscalationChat, setSelectedIssueId, activeIssues, inProgressIssues, resolvedIssues, isExpert, updateProjectEscalation, downloadDocumentUrl, bucketName, }: EscalationTabProps) => JSX.Element;
 export default EscalationTabsContent;

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

@@ -30,18 +30,18 @@ const react_1 = __importDefault(require("react"));
 const EscalationIssueCard_1 = __importStar(require("./EscalationIssueCard"));
 const base_ui_1 = require("@paro.io/base-ui");
 ;
-const EscalationTabsContent = ({ activeTab, openEscalationChat, setSelectedIssueId, activeIssues, inProgressIssues, resolvedIssues, isExpert, }) => {
+const EscalationTabsContent = ({ activeTab, openEscalationChat, setSelectedIssueId, activeIssues, inProgressIssues, resolvedIssues, isExpert, updateProjectEscalation, downloadDocumentUrl, bucketName, }) => {
     if (activeTab === 'action-required') {
         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 Requiring Your Response")),
-            react_1.default.createElement(EscalationIssueCard_1.default, { issues: activeIssues, isExpert: isExpert, openEscalationChat: openEscalationChat, showRespondButton: true, setSelectedIssueId: setSelectedIssueId })));
+            react_1.default.createElement(EscalationIssueCard_1.default, { issues: activeIssues, isExpert: isExpert, openEscalationChat: openEscalationChat, showRespondButton: true, setSelectedIssueId: setSelectedIssueId, updateProjectEscalation: updateProjectEscalation, downloadDocumentUrl: downloadDocumentUrl, bucketName: bucketName })));
     }
     if (activeTab === 'in-progress') {
         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 })));
+            react_1.default.createElement(EscalationIssueCard_1.default, { issues: inProgressIssues, isExpert: isExpert, openEscalationChat: openEscalationChat, showMarkResolvedButton: true, updateProjectEscalation: updateProjectEscalation, downloadDocumentUrl: downloadDocumentUrl, bucketName: bucketName })));
     }
     if (activeTab === 'resolved') {
         return (react_1.default.createElement("div", null,
@@ -77,12 +77,7 @@ const EscalationTabsContent = ({ activeTab, openEscalationChat, setSelectedIssue
                                     react_1.default.createElement("span", { className: "text-xs text-gray-500" },
                                         "Resolved By ",
                                         issue.resolvedBy)))),
-                        react_1.default.createElement(base_ui_1.Button, { onClick: () => openEscalationChat({
-                                title: issue.chatTitle,
-                                project: issue.projectName,
-                                id: issue.id,
-                                status: issue.chatStatus
-                            }), label: "Chat", color: "primary" }))));
+                        react_1.default.createElement(base_ui_1.Button, { onClick: () => openEscalationChat(issue), label: "Chat", color: "primary" }))));
             }))
                 :
                     react_1.default.createElement("div", null, "No resolved issues.")));

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

@@ -1,10 +1,16 @@
 interface EscalationsProps {
-    experts: any[];
+    expertsOrClients: any[];
     projects: any[];
     isExpert: boolean;
-    activeIssues: any[];
-    inProgressIssues: any[];
-    resolvedIssues: any[];
+    escalations: any[];
+    documentUploadUrl: string;
+    downloadDocumentUrl: string;
+    uploadExpertClientFiles?: any;
+    createProjectEscalation: any;
+    updateProjectEscalation: any;
+    createEscalationChatMessage: any;
+    bucketName: string;
+    user: any;
 }
-export declare const Escalations: ({ experts, projects, isExpert, activeIssues, inProgressIssues, resolvedIssues, }: EscalationsProps) => JSX.Element;
+export declare const Escalations: ({ expertsOrClients, projects, isExpert, escalations, documentUploadUrl, downloadDocumentUrl, uploadExpertClientFiles, createProjectEscalation, updateProjectEscalation, createEscalationChatMessage, bucketName, user, }: EscalationsProps) => JSX.Element;
 export {};

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

@@ -39,7 +39,7 @@ const AccountSuspensionBanner_1 = __importDefault(require("./AccountSuspensionBa
 const AccountSuspensionModal_1 = __importDefault(require("./AccountSuspensionModal"));
 const base_icons_1 = require("@paro.io/base-icons");
 const EscalationIssueCard_1 = require("./EscalationIssueCard");
-const Escalations = ({ experts, projects, isExpert = false, activeIssues, inProgressIssues, resolvedIssues, }) => {
+const Escalations = ({ expertsOrClients, projects, isExpert = false, escalations, documentUploadUrl, downloadDocumentUrl, uploadExpertClientFiles, createProjectEscalation, updateProjectEscalation, createEscalationChatMessage, bucketName, user, }) => {
     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
@@ -47,6 +47,9 @@ const Escalations = ({ experts, projects, isExpert = false, activeIssues, inProg
     const [activeChatIssue, setActiveChatIssue] = (0, react_1.useState)(null); // update required
     const [activeEscalationTab, setActiveEscalationTab] = (0, react_1.useState)('action-required');
     const [showSuspensionModal, setShowSuspensionModal] = (0, react_1.useState)(false);
+    const activeIssues = escalations.filter(issue => { var _a; return (((_a = issue === null || issue === void 0 ? void 0 : issue.submittedByUser) === null || _a === void 0 ? void 0 : _a.userTypeId) !== user.userTypeId) && (issue === null || issue === void 0 ? void 0 : issue.status) === 'InProgress'; });
+    const inProgressIssues = escalations.filter(issue => { var _a; return ((_a = issue === null || issue === void 0 ? void 0 : issue.submittedByUser) === null || _a === void 0 ? void 0 : _a.userTypeId) === user.userTypeId && (issue === null || issue === void 0 ? void 0 : issue.status) === 'InProgress'; });
+    const resolvedIssues = escalations.filter(issue => (issue === null || issue === void 0 ? void 0 : issue.status) === 'Resolved');
     const goBack = () => {
         if (selectedIssueId !== null) {
             setSelectedIssueId(null);
@@ -136,10 +139,10 @@ const Escalations = ({ experts, projects, isExpert = false, activeIssues, inProg
                 !isExpert &&
                     react_1.default.createElement(EscalationReportBanner_1.default, { onReport: () => setSelectedIssueId(0) }),
                 react_1.default.createElement(EscalationTabs_1.default, { activeTab: activeEscalationTab, setActiveTab: setActiveEscalationTab, activeIssues: activeIssues.length, inProgressIssues: inProgressIssues.length, resolvedIssues: resolvedIssues.length }),
-                react_1.default.createElement(EscalationTabsContent_1.default, { activeTab: activeEscalationTab, openEscalationChat: openEscalationChat, setSelectedIssueId: setSelectedIssueId, activeIssues: activeIssues, inProgressIssues: inProgressIssues, resolvedIssues: resolvedIssues, isExpert: isExpert })),
-            activeSection === 'support' && activeIssues.filter((issue) => issue.id === selectedIssueId).length > 0 && (react_1.default.createElement(EscalationRespondForm_1.default, { goBack: goBack, selectedIssue: activeIssues.filter((issue) => issue.id === selectedIssueId), goHome: goHome })),
-            activeSection === 'support' && selectedIssueId === 0 && (react_1.default.createElement(EscalationSubmitForm_1.default, { goBack: goBack, goHome: goHome, experts: experts, projects: projects, isExpert: isExpert })),
-            showEscalationChat && activeChatIssue && (react_1.default.createElement(EscalationChat_1.default, { activeChatIssue: activeChatIssue, showEscalationChat: showEscalationChat, setShowEscalationChat: setShowEscalationChat })),
+                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 })),
+            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 })),
+            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 })),
+            showEscalationChat && activeChatIssue && (react_1.default.createElement(EscalationChat_1.default, { activeChatIssue: activeChatIssue, showEscalationChat: showEscalationChat, setShowEscalationChat: setShowEscalationChat, user: user, createEscalationChatMessage: createEscalationChatMessage, documentUploadUrl: documentUploadUrl, bucketName: bucketName, uploadExpertClientFiles: uploadExpertClientFiles, createProjectEscalation: createProjectEscalation, isExpert: isExpert })),
             showSuspensionModal &&
                 react_1.default.createElement(AccountSuspensionModal_1.default, { showSuspensionModal: showSuspensionModal, onClose: () => setShowSuspensionModal(false) }))));
 };

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

@@ -2,14 +2,18 @@ interface UploadFileParams {
     file: File;
     documentName: string;
     disputeId?: number;
-    projectId: number;
+    escalationId?: string;
+    escalationNumber?: string;
+    projectId?: number;
     documentUploadUrl: string;
     bucketName: string;
-    updateClientInvoiceDisputeMutation: any;
+    updateClientInvoiceDisputeMutation?: any;
+    updateProjectEscalation?: any;
     uploadExpertClientFiles?: any;
-    previousFiles: string | string[];
+    createProjectEscalation?: any;
+    previousFiles?: string | string[];
     isExpert: boolean;
-    disputeData?: {
+    extraData?: {
         clientId: number;
         clientName: string;
         email: string;
@@ -18,5 +22,5 @@ interface UploadFileParams {
         projectName: string;
     };
 }
-export declare const fileUploader: ({ file, projectId, documentUploadUrl, updateClientInvoiceDisputeMutation, uploadExpertClientFiles, bucketName, disputeId, previousFiles, isExpert, disputeData, }: UploadFileParams) => Promise<any>;
+export declare const fileUploader: ({ file, projectId, documentUploadUrl, updateClientInvoiceDisputeMutation, updateProjectEscalation, uploadExpertClientFiles, createProjectEscalation, bucketName, disputeId, escalationId, escalationNumber, previousFiles, isExpert, extraData, }: UploadFileParams) => Promise<any>;
 export {};

package/lib/components/FileUploader/index.js CHANGED Viewed

@@ -15,7 +15,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fileUploader = void 0;
 const UploadClient_1 = __importDefault(require("../shared/UploadClient"));
 const utils_1 = require("../shared/utils");
-const fileUploader = (_a) => __awaiter(void 0, [_a], void 0, function* ({ file, projectId, documentUploadUrl, updateClientInvoiceDisputeMutation, uploadExpertClientFiles, bucketName, disputeId, previousFiles, isExpert, disputeData, }) {
+const fileUploader = (_a) => __awaiter(void 0, [_a], void 0, function* ({ file, projectId, documentUploadUrl, updateClientInvoiceDisputeMutation, updateProjectEscalation, uploadExpertClientFiles, createProjectEscalation, bucketName, disputeId, escalationId, escalationNumber, previousFiles, isExpert, extraData, }) {
+    console.log("input params here in file uploader is ", {
+        file,
+        disputeId,
+        escalationId,
+        projectId,
+        documentUploadUrl,
+        bucketName,
+        updateClientInvoiceDisputeMutation,
+        updateProjectEscalation,
+        uploadExpertClientFiles,
+        createProjectEscalation,
+        previousFiles,
+        isExpert,
+        extraData,
+    });
+    // Add these debug logs
+    console.log("escalationId exists?", !!escalationId);
+    console.log("escalationId value:", escalationId);
+    console.log("updateProjectEscalation exists?", !!updateProjectEscalation);
+    console.log("typeof updateProjectEscalation:", typeof updateProjectEscalation);
     const documentLinks = previousFiles ? (typeof previousFiles === 'string' ? previousFiles.split(',') : [...previousFiles]) : [];
     try {
         (0, utils_1.showToast)('success', 'Starting Document Upload');
@@ -23,6 +43,7 @@ const fileUploader = (_a) => __awaiter(void 0, [_a], void 0, function* ({ file,
             fileSelected: file,
             fileName: file.name,
             projectId,
+            escalationId,
             documentUploadUrl,
             bucketName: bucketName,
         });
@@ -30,6 +51,7 @@ const fileUploader = (_a) => __awaiter(void 0, [_a], void 0, function* ({ file,
             const resParsed = JSON.parse(res);
             const documentLink = resParsed === null || resParsed === void 0 ? void 0 : resParsed.Location;
             documentLinks.push(documentLink); // Add the new file to the documentLinks array
+            console.log("document links are ", documentLinks);
             const promises = [];
             if (disputeId) {
                 promises.push(updateClientInvoiceDisputeMutation({
@@ -47,20 +69,43 @@ const fileUploader = (_a) => __awaiter(void 0, [_a], void 0, function* ({ file,
                     },
                 }));
             }
-            if (uploadExpertClientFiles && disputeData) {
+            console.log("Escalation id is ", escalationId);
+            console.log("About to check escalationId condition");
+            if (escalationNumber) {
+                console.log("escalationId condition is TRUE - adding updateProjectEscalation to promises");
+                console.log("updateProjectEscalation function:", updateProjectEscalation);
+                const escalationPromise = updateProjectEscalation({
+                    variables: {
+                        input: Object.assign({ escalationId }, (isExpert ? {
+                            expertSupportingDocuments: documentLinks.join(',')
+                        } : {
+                            clientSupportingDocuments: documentLinks.join(',')
+                        }))
+                    },
+                });
+                console.log("Created escalation promise:", escalationPromise);
+                promises.push(escalationPromise);
+                console.log("Added escalation promise to promises array");
+            }
+            else {
+                console.log("escalationId condition is FALSE");
+            }
+            console.log("promises are ", promises.length, promises);
+            if (uploadExpertClientFiles && extraData) {
+                console.log("extra data is ", extraData);
                 promises.push(uploadExpertClientFiles({
                     variables: {
                         input: {
-                            clientId: disputeData.clientId,
-                            clientName: disputeData.clientName,
-                            email: disputeData.email,
+                            clientId: extraData.clientId,
+                            clientName: extraData.clientName,
+                            email: extraData.email,
                             fileName: file.name,
                             fileSize: file.size,
-                            fileType: 'DISPUTE_DOCUMENTS',
-                            freelancerId: disputeData.freelancerId,
-                            freelancerName: disputeData.freelancerName,
+                            fileType: disputeId ? 'DISPUTE_DOCUMENTS' : 'ESCALATION_DOCUMENTS',
+                            freelancerId: extraData.freelancerId,
+                            freelancerName: extraData.freelancerName,
                             projectId: projectId,
-                            projectName: disputeData.projectName,
+                            projectName: extraData.projectName,
                             uploadedBy: isExpert ? 'FREELANCER' : 'CLIENT',
                             data: "",
                         },
@@ -78,6 +123,7 @@ const fileUploader = (_a) => __awaiter(void 0, [_a], void 0, function* ({ file,
         return documentLinks;
     }
     catch (error) {
+        console.error("Error in fileUploader:", error);
         (0, utils_1.showToast)('warning', 'Error uploading file. Please try again.');
         return false;
     }

package/lib/components/Invoices/ClientDisputeProjectCard.d.ts CHANGED Viewed

@@ -6,6 +6,6 @@ interface ClientDisputeProjectCardProps {
     bucketName?: string;
     uploadExpertClientFiles?: any;
 }
-export declare const handleDownloadDocument: (projectId: number, fileName: string, downloadDocumentUrl: string, bucketName: string | undefined) => Promise<void>;
+export declare const handleDownloadDocument: (projectId: number, fileName: string, downloadDocumentUrl: string, bucketName: string | undefined, escalationId?: string | undefined) => Promise<void>;
 export declare const ClientDisputeProjectCard: ({ clientInvoice, updateClientInvoiceDisputeMutation, documentUploadUrl, downloadDocumentUrl, bucketName, uploadExpertClientFiles }: ClientDisputeProjectCardProps) => JSX.Element;
 export {};

package/lib/components/Invoices/ClientDisputeProjectCard.js CHANGED Viewed

@@ -131,11 +131,11 @@ const handleFileDownload = ({ fileData, downloadFilename, streamData, fileType =
     document.body.removeChild(downloadLink);
     URL.revokeObjectURL(blobUrl);
 };
-const handleDownloadDocument = (projectId, fileName, downloadDocumentUrl, bucketName) => __awaiter(void 0, void 0, void 0, function* () {
+const handleDownloadDocument = (projectId, fileName, downloadDocumentUrl, bucketName, escalationId) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     // Decode the filename from URL encoding if needed
     const decodedFileName = decodeURIComponent(fileName);
-    const downloadFileName = `project-${projectId}/${decodedFileName}`;
+    const downloadFileName = escalationId ? `escalation-${escalationId}/${decodedFileName}` : `project-${projectId}/${decodedFileName}`;
     const downloadData = yield (0, FileDownloader_1.fileDownloader)({ downloadDocumentUrl: downloadDocumentUrl, fileKey: downloadFileName, bucketName: bucketName });
     handleFileDownload({
         fileData: downloadData,
@@ -205,7 +205,7 @@ const ClientDisputeProjectCard = ({ clientInvoice, updateClientInvoiceDisputeMut
                                 previousFiles: (_e = (_d = (_c = clientInvoice === null || clientInvoice === void 0 ? void 0 : clientInvoice.disputeProjects) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.clientDocumentLinks) !== null && _e !== void 0 ? _e : [],
                                 isExpert: false,
                                 uploadExpertClientFiles: uploadExpertClientFiles,
-                                disputeData: {
+                                extraData: {
                                     clientId: (_f = clientInvoice === null || clientInvoice === void 0 ? void 0 : clientInvoice.invoice) === null || _f === void 0 ? void 0 : _f.clientId,
                                     clientName: (_g = clientInvoice === null || clientInvoice === void 0 ? void 0 : clientInvoice.client) === null || _g === void 0 ? void 0 : _g.name,
                                     email: (_h = clientInvoice === null || clientInvoice === void 0 ? void 0 : clientInvoice.freelancer) === null || _h === void 0 ? void 0 : _h.email,

package/lib/components/Invoices/DiscussionSection.d.ts CHANGED Viewed

@@ -12,11 +12,11 @@ interface Message {
 }
 interface DiscussionSectionProps {
     disputeId?: string;
-    escalationId?: number;
+    escalationNumber?: number;
     currentUser: any;
     messages: Message[];
     onCreateMessage: (variables: any) => Promise<any>;
     isInternal?: boolean;
 }
-export declare const DiscussionSection: ({ disputeId, escalationId, currentUser, messages, onCreateMessage, isInternal, }: DiscussionSectionProps) => JSX.Element;
+export declare const DiscussionSection: ({ disputeId, escalationNumber, currentUser, messages, onCreateMessage, isInternal, }: DiscussionSectionProps) => JSX.Element;
 export {};

package/lib/components/Invoices/DiscussionSection.js CHANGED Viewed

@@ -40,7 +40,7 @@ const react_1 = __importStar(require("react"));
 const base_ui_1 = require("@paro.io/base-ui");
 const dayjs_1 = __importDefault(require("dayjs"));
 const base_icons_1 = require("@paro.io/base-icons");
-const DiscussionSection = ({ disputeId, escalationId, currentUser, messages, onCreateMessage, isInternal = false, }) => {
+const DiscussionSection = ({ disputeId, escalationNumber, currentUser, messages, onCreateMessage, isInternal = false, }) => {
     const [newMessage, setNewMessage] = (0, react_1.useState)('');
     const [visibility, setVisibility] = (0, react_1.useState)('ALL');
     const [isLoading, setIsLoading] = (0, react_1.useState)(false);
@@ -55,7 +55,7 @@ const DiscussionSection = ({ disputeId, escalationId, currentUser, messages, onC
             return;
         try {
             setIsLoading(true);
-            const inputData = Object.assign({ messageText: newMessage, visibility, senderId: currentUser === null || currentUser === void 0 ? void 0 : currentUser.userId }, (disputeId ? { disputeId } : { escalationId }));
+            const inputData = Object.assign({ messageText: newMessage, visibility, senderId: currentUser === null || currentUser === void 0 ? void 0 : currentUser.userId }, (disputeId ? { disputeId } : { escalationNumber }));
             yield onCreateMessage({
                 variables: {
                     input: inputData,

package/lib/components/Invoices/DisputeSection.js CHANGED Viewed

@@ -86,7 +86,7 @@ const DisputeSection = ({ dispute, documentUploadUrl, downloadDocumentUrl, bucke
                         disputeId: dispute === null || dispute === void 0 ? void 0 : dispute.disputeId,
                         previousFiles: isExpert ? expertDocumentLinks : clientDocumentLinks,
                         isExpert: isExpert,
-                        disputeData: {
+                        extraData: {
                             clientId: (_c = dispute === null || dispute === void 0 ? void 0 : dispute.invoice) === null || _c === void 0 ? void 0 : _c.clientId,
                             clientName: (_d = dispute === null || dispute === void 0 ? void 0 : dispute.client) === null || _d === void 0 ? void 0 : _d.name,
                             email: (_e = dispute === null || dispute === void 0 ? void 0 : dispute.freelancer) === null || _e === void 0 ? void 0 : _e.email,

package/lib/components/shared/UploadClient.d.ts CHANGED Viewed

@@ -6,9 +6,10 @@ export default class UploadClient {
         documentUploadUrl: string;
         projectId: number;
         bucketName: string;
+        escalationId: string;
     };
     constructor(props: any);
-    generateS3Key(projectId: number, fileName: string): string;
+    generateS3Key(projectId: number, escalationId: string, fileName: string): string;
     triggerMultipartUpload(): Promise<string | undefined>;
     uploadMultiPartFile(): Promise<string | undefined>;
     completeUpload(partsArray: any): Promise<string | undefined>;