adriano.andrade
/
projeto-hit
mirror of https://github.com/AdrianoRobson/projeto-hit.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'integracao_wa_oficial_el_editing_4_test' into integracao_wa_oficial_sos_el

adriano 2024-02-08 09:36:43 -03:00
parent bc93d3a9d6 c444012963
commit aa2ee96412
2 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
backend/src/helpers/SchedulingNotifySendMessage.ts
View File

@ -90,33 +90,33 @@ const monitor = async () => {
} }
// exec("df -h /", (error: any, stdout: any, stderr: any) => { exec("df -h /", (error: any, stdout: any, stderr: any) => {
// if (error) { if (error) {
// console.log(`exec error: ${error.message}`); console.log(`exec error: ${error.message}`);
// return; return;
// } }
// if (stderr) { if (stderr) {
// console.log(`exec stderr: ${stderr}`); console.log(`exec stderr: ${stderr}`);
// return; return;
// } }
// stdout = stdout.split(/\r?\n/) stdout = stdout.split(/\r?\n/)
// stdout = stdout[1].trim().split(/\s+/) stdout = stdout[1].trim().split(/\s+/)
// // DISK SPACE MONITORING // DISK SPACE MONITORING
// const io = getIO(); const io = getIO();
// io.emit("diskSpaceMonit", { io.emit("diskSpaceMonit", {
// action: "update", action: "update",
// diskSpace: { diskSpace: {
// size: stdout[1], size: stdout[1],
// used: stdout[2], used: stdout[2],
// available: stdout[3], available: stdout[3],
// use: stdout[4] use: stdout[4]
// } }
// }); });
// }); });

9
frontend/src/components/MessageInput/index.js
View File

@ -321,7 +321,6 @@ const MessageInput = ({ ticketStatus }) => {
setTabOption('open') setTabOption('open')
} }
if (templateParams) { if (templateParams) {
for (let key in templateParams) { for (let key in templateParams) {
if (templateParams.hasOwnProperty(key)) { if (templateParams.hasOwnProperty(key)) {
@ -331,7 +330,7 @@ const MessageInput = ({ ticketStatus }) => {
if (key === '_reactName') { if (key === '_reactName') {
templateParams = null templateParams = null
break break
} }
} }
} }
} }
@ -341,13 +340,13 @@ const MessageInput = ({ ticketStatus }) => {
fromMe: true, fromMe: true,
mediaUrl: "", mediaUrl: "",
body: (signMessage && !templateParams) ? `*${user?.name}:*\n${inputMessage.trim()}` : inputMessage.trim(), body: (signMessage && !templateParams) ? `*${user?.name}:*\n${inputMessage.trim()}` : inputMessage.trim(),
quotedMsg: replyingMessage quotedMsg: replyingMessage
} }
if (templateParams) { if (templateParams) {
message = { ...message, params: templateParams } message = { ...message, params: templateParams }
} }
try { try {