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

package/lib/components/Escalations/EscalationChat.js

@@ -60,7 +60,7 @@ const EscalationChat = ({ activeChatIssue, showEscalationChat, setShowEscalation
                 return new Promise((resolve, reject) => {
                     const reader = new FileReader();
                     reader.onloadend = () => __awaiter(void 0, void 0, void 0, function* () {
-                        var _a;
+                        var _a, _b, _c, _d, _e, _f, _g, _h;
                         try {
                             const res = yield (0, FileUploader_1.fileUploader)({
                                 file: selectedFile,
@@ -73,11 +73,11 @@ const EscalationChat = ({ activeChatIssue, showEscalationChat, setShowEscalation
                                 uploadExpertClientFiles: uploadExpertClientFiles,
                                 createProjectEscalation: createProjectEscalation,
                                 extraData: {
-                                    clientId: activeChatIssue.client.id,
-                                    clientName: activeChatIssue.client.name,
-                                    email: isExpert ? "client@gmail.com" : user === null || user === void 0 ? void 0 : user.email,
-                                    freelancerId: activeChatIssue.freelancer.id,
-                                    freelancerName: (_a = activeChatIssue.freelancer.name) !== null && _a !== void 0 ? _a : '',
+                                    clientId: (_a = activeChatIssue.client.id) !== null && _a !== void 0 ? _a : 0,
+                                    clientName: (_b = activeChatIssue.client.name) !== null && _b !== void 0 ? _b : '',
+                                    email: isExpert ? (_e = (_d = (_c = activeChatIssue === null || activeChatIssue === void 0 ? void 0 : activeChatIssue.client) === null || _c === void 0 ? void 0 : _c.primaryContact) === null || _d === void 0 ? void 0 : _d.email) !== null && _e !== void 0 ? _e : '' : (_f = user === null || user === void 0 ? void 0 : user.email) !== null && _f !== void 0 ? _f : '',
+                                    freelancerId: (_g = activeChatIssue.freelancer.id) !== null && _g !== void 0 ? _g : 0,
+                                    freelancerName: (_h = activeChatIssue.freelancer.name) !== null && _h !== void 0 ? _h : '',
                                     projectName: activeChatIssue.projectDetails.length > 0 ? activeChatIssue.projectDetails[0].projectName : '',
                                 }
                             });
@@ -86,7 +86,7 @@ const EscalationChat = ({ activeChatIssue, showEscalationChat, setShowEscalation
                             }
                         }
                         catch (error) {
-                            reject(error);
+                            console.error("faile upload failed", error);
                         }
                         finally {
                             resolve();

package/lib/components/Escalations/EscalationIssueCard.js

@@ -8,6 +8,7 @@ const react_1 = __importDefault(require("react"));
 const base_ui_1 = require("@paro.io/base-ui");
 const ClientDisputeProjectCard_1 = require("../Invoices/ClientDisputeProjectCard");
 const base_icons_1 = require("@paro.io/base-icons");
+const dayjs_1 = __importDefault(require("dayjs"));
 const getBackgroundColor = (type) => {
     switch (type) {
         case 'Critical':
@@ -39,10 +40,11 @@ const EscalationIssueCard = ({ issues, isExpert, openEscalationChat, showRespond
             : '';
         const docs = [issue.expertSupportingDocuments, issue.clientSupportingDocuments, issue.internalSupportingDocuments];
         const processedDocs = docs
-            .filter(doc => doc !== null && doc !== undefined && doc !== '')
+            .filter(doc => doc !== null && doc !== undefined && doc !== '' && doc !== "NULL")
             .flatMap(doc => doc.split(','))
             .map(doc => doc.trim())
-            .filter(doc => doc !== '');
+            .filter(doc => doc !== '' || doc !== "NULL");
+        console.log({ processedDocs, docs });
         return (react_1.default.createElement("div", { key: issue.id, 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" },
@@ -61,7 +63,7 @@ const EscalationIssueCard = ({ issues, isExpert, openEscalationChat, showRespond
                         react_1.default.createElement("span", { className: "font-bold" }, issue.submittedByUser.firstName + " " + issue.submittedByUser.lastName),
                         issue.createdAt && react_1.default.createElement(react_1.default.Fragment, null,
                             " \u2022 Submitted on: ",
-                            react_1.default.createElement("span", { className: "font-bold" }, issue.createdAt)))),
+                            react_1.default.createElement("span", { className: "font-bold" }, (0, dayjs_1.default)(issue.createdAt).format("MM-DD-YYYY"))))),
                 react_1.default.createElement("div", { className: "text-sm text-gray-600 mb-3" }, issue.outcome),
                 processedDocs && processedDocs.length > 0 && (react_1.default.createElement("div", { className: "flex flex-wrap gap-2" },
                     react_1.default.createElement("span", { className: "text-sm font-bold text-gray-500 items-center" }, "Supporting Documents: "),

package/lib/components/Escalations/EscalationRespondForm.js

@@ -38,6 +38,7 @@ const base_icons_1 = require("@paro.io/base-icons");
 const base_ui_1 = require("@paro.io/base-ui");
 const FileUploader_1 = require("../FileUploader");
 const EscalationIssueCard_1 = require("./EscalationIssueCard");
+const utils_1 = require("../shared/utils");
 exports.ACCEPTED_FILE_TYPES = [
     'application/pdf',
     'application/msword',
@@ -122,7 +123,7 @@ const EscalationRespondForm = ({ goBack, selectedIssue, documentUploadUrl, downl
                             }
                         }
                         catch (error) {
-                            reject(error);
+                            console.error("Failed to upload file", error);
                         }
                         finally {
                             resolve();
@@ -155,9 +156,11 @@ const EscalationRespondForm = ({ goBack, selectedIssue, documentUploadUrl, downl
                     }
                 }
             });
+            (0, utils_1.showToast)("success", "Response submitted!");
         }
         catch (error) {
             console.error("Failed to send response!", error);
+            (0, utils_1.showToast)("warning", "Failed to update response!");
         }
         finally {
             setSubmitting(false);

package/lib/components/Escalations/EscalationSubmitForm.js

@@ -113,6 +113,7 @@ const EscalationSubmitForm = ({ goBack, goHome, expertsOrClients, projects, docu
                 return new Promise((resolve, reject) => {
                     const reader = new FileReader();
                     reader.onloadend = () => __awaiter(void 0, void 0, void 0, function* () {
+                        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
                         try {
                             const res = yield (0, FileUploader_1.fileUploader)({
                                 file: selectedFile,
@@ -125,11 +126,11 @@ const EscalationSubmitForm = ({ goBack, goHome, expertsOrClients, projects, docu
                                 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,
+                                    clientId: isExpert ? (_a = selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.id) !== null && _a !== void 0 ? _a : 0 : (_b = user === null || user === void 0 ? void 0 : user.userId) !== null && _b !== void 0 ? _b : 0,
+                                    clientName: isExpert ? (_c = selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.name) !== null && _c !== void 0 ? _c : '' : (_d = user === null || user === void 0 ? void 0 : user.name) !== null && _d !== void 0 ? _d : '',
+                                    email: isExpert ? (_f = (_e = selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.primaryContact) === null || _e === void 0 ? void 0 : _e.email) !== null && _f !== void 0 ? _f : '' : (_g = user === null || user === void 0 ? void 0 : user.email) !== null && _g !== void 0 ? _g : '',
+                                    freelancerId: isExpert ? (_h = user === null || user === void 0 ? void 0 : user.userId) !== null && _h !== void 0 ? _h : 0 : (_j = selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.id) !== null && _j !== void 0 ? _j : 0,
+                                    freelancerName: isExpert ? (_k = user === null || user === void 0 ? void 0 : user.name) !== null && _k !== void 0 ? _k : '' : (_l = selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.name) !== null && _l !== void 0 ? _l : '',
                                     projectName: selectedProjects.length > 0 ? selectedProjects[0].name : '',
                                 }
                             });
@@ -196,9 +197,11 @@ const EscalationSubmitForm = ({ goBack, goHome, expertsOrClients, projects, docu
                     input: formData
                 }
             });
+            (0, utils_1.showToast)("success", "Escalation created successfully!");
         }
         catch (error) {
             console.error("Failed to create an escalation!", error);
+            (0, utils_1.showToast)("warning", "Failed to create escalation!");
         }
         finally {
             setSubmitting(false);

package/lib/components/Escalations/Escalations.js

@@ -44,10 +44,22 @@ const Escalations = ({ expertsOrClients, projects, isExpert = false, escalations
     const [selectedProject, setSelectedProject] = (0, react_1.useState)(null);
     const [selectedIssueId, setSelectedIssueId] = (0, react_1.useState)(null); // using selectedIssueId 0 for new escalation submission
     const [showEscalationChat, setShowEscalationChat] = (0, react_1.useState)(false);
-    const [activeChatIssue, setActiveChatIssue] = (0, react_1.useState)(null); // update required
+    const [activeChatIssue, setActiveChatIssue] = (0, react_1.useState)(null);
     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 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 internalEscalationTo = issue === null || issue === void 0 ? void 0 : issue.internalEscalationTo;
+        const status = issue === null || issue === void 0 ? void 0 : issue.status;
+        // Determine if this issue should be shown to the current user
+        const isRelevantEscalation = (isExpert
+            ? (internalEscalationTo === 'expert' || internalEscalationTo === 'both')
+            : (internalEscalationTo === 'client' || internalEscalationTo === 'both'));
+        return ((userTypeId !== user.userTypeId ||
+            (userTypeId === 2 && isRelevantEscalation)) &&
+            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 = () => {

package/lib/components/FileUploader/index.js

@@ -16,26 +16,6 @@ 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, 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');
@@ -51,7 +31,6 @@ 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({
@@ -69,11 +48,7 @@ const fileUploader = (_a) => __awaiter(void 0, [_a], void 0, function* ({ file,
                     },
                 }));
             }
-            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 ? {
@@ -83,16 +58,12 @@ const fileUploader = (_a) => __awaiter(void 0, [_a], void 0, function* ({ file,
                         }))
                     },
                 });
-                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: {

package/lib/components/shared/UploadClient.js

@@ -33,7 +33,6 @@ class UploadClient {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const fileName = this.generateS3Key(this.state.projectId, this.state.escalationId, this.state.fileName);
-                console.log('File Name', fileName);
                 this.state = Object.assign(Object.assign({}, this.state), { fileName: fileName });
                 const params = {
                     fileName: this.state.fileName,
@@ -123,7 +122,6 @@ class UploadClient {
                     throw new Error('Failed to complete multipart upload');
                 }
                 const { responseData } = yield response.json();
-                console.log('Upload Complete', responseData);
                 return `${JSON.stringify(responseData)}`;
             }
             catch (error) {

package/package.json

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