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

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;
                         try {
                             const res = yield (0, FileUploader_1.fileUploader)({
                                 file: selectedFile,
@@ -127,7 +128,7 @@ const EscalationSubmitForm = ({ goBack, goHome, expertsOrClients, projects, docu
                                 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,
+                                    email: isExpert ? (_a = selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.primaryContact) === null || _a === void 0 ? void 0 : _a.email : 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 : '',

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.44",
   "description": "",
   "main": "lib/index.js",
   "scripts": {