From 2e0d43c09373199284437466b111d55c8b1f404c Mon Sep 17 00:00:00 2001 From: Pranav Raj S Date: Fri, 6 May 2022 20:19:36 +0530 Subject: [PATCH] chore: Use different files for widget and dashboard audio alert (#4637) --- app/javascript/sdk/IFrameHelper.js | 2 +- .../shared/helpers/AudioNotificationHelper.js | 4 ++-- config/environments/development.rb | 2 +- config/environments/production.rb | 2 +- config/environments/staging.rb | 2 +- config/environments/test.rb | 2 +- .../audios => audio/dashboard}/ding.mp3 | Bin public/audio/widget/ding.mp3 | Bin 0 -> 2667 bytes 8 files changed, 7 insertions(+), 7 deletions(-) rename public/{dashboard/audios => audio/dashboard}/ding.mp3 (100%) create mode 100644 public/audio/widget/ding.mp3 diff --git a/app/javascript/sdk/IFrameHelper.js b/app/javascript/sdk/IFrameHelper.js index 9641a4226..2f3ad5cfd 100644 --- a/app/javascript/sdk/IFrameHelper.js +++ b/app/javascript/sdk/IFrameHelper.js @@ -121,7 +121,7 @@ export const IFrameHelper = { setupAudioListeners: () => { const { baseUrl = '' } = window.$chatwoot; - getAlertAudio(baseUrl).then(() => + getAlertAudio(baseUrl, 'widget').then(() => initOnEvents.forEach(event => { document.removeEventListener( event, diff --git a/app/javascript/shared/helpers/AudioNotificationHelper.js b/app/javascript/shared/helpers/AudioNotificationHelper.js index d4fbc9e2c..c3108f174 100644 --- a/app/javascript/shared/helpers/AudioNotificationHelper.js +++ b/app/javascript/shared/helpers/AudioNotificationHelper.js @@ -4,7 +4,7 @@ import { IFrameHelper } from 'widget/helpers/utils'; import { showBadgeOnFavicon } from './faviconHelper'; export const initOnEvents = ['click', 'touchstart', 'keypress', 'keydown']; -export const getAlertAudio = async (baseUrl = '') => { +export const getAlertAudio = async (baseUrl = '', type = 'dashboard') => { const audioCtx = new (window.AudioContext || window.webkitAudioContext)(); const playsound = audioBuffer => { window.playAudioAlert = () => { @@ -17,7 +17,7 @@ export const getAlertAudio = async (baseUrl = '') => { }; try { - const resourceUrl = `${baseUrl}/dashboard/audios/ding.mp3`; + const resourceUrl = `${baseUrl}/audio/${type}/ding.mp3`; const audioRequest = new Request(resourceUrl); fetch(audioRequest) diff --git a/config/environments/development.rb b/config/environments/development.rb index 67ffa6a52..9791505d9 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -82,7 +82,7 @@ Rails.application.configure do allow do origins '*' resource '/packs/*', headers: :any, methods: [:get, :options] - resource '/dashboard/audios/ding.mp3', headers: :any, methods: [:get, :options] + resource '/audio/*', headers: :any, methods: [:get, :options] resource '*', headers: :any, methods: :any, expose: ['access-token', 'client', 'uid', 'expiry'] end end diff --git a/config/environments/production.rb b/config/environments/production.rb index e538e2867..ac0567c62 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -121,7 +121,7 @@ Rails.application.configure do allow do origins '*' resource '/packs/*', headers: :any, methods: [:get, :options] - resource '/dashboard/audios/ding.mp3', headers: :any, methods: [:get, :options] + resource '/audio/*', headers: :any, methods: [:get, :options] if ActiveModel::Type::Boolean.new.cast(ENV.fetch('CW_API_ONLY_SERVER', false)) resource '*', headers: :any, methods: :any, expose: ['access-token', 'client', 'uid', 'expiry'] end diff --git a/config/environments/staging.rb b/config/environments/staging.rb index 6e9b3dcf8..241b3f9a7 100644 --- a/config/environments/staging.rb +++ b/config/environments/staging.rb @@ -87,7 +87,7 @@ Rails.application.configure do allow do origins '*' resource '/packs/*', headers: :any, methods: [:get, :options] - resource '/dashboard/audios/ding.mp3', headers: :any, methods: [:get, :options] + resource '/audio/*', headers: :any, methods: [:get, :options] end end end diff --git a/config/environments/test.rb b/config/environments/test.rb index 43b7108b8..3dfe52c68 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -58,7 +58,7 @@ Rails.application.configure do allow do origins '*' resource '/packs/*', headers: :any, methods: [:get, :options] - resource '/dashboard/audios/ding.mp3', headers: :any, methods: [:get, :options] + resource '/audio/*', headers: :any, methods: [:get, :options] end end end diff --git a/public/dashboard/audios/ding.mp3 b/public/audio/dashboard/ding.mp3 similarity index 100% rename from public/dashboard/audios/ding.mp3 rename to public/audio/dashboard/ding.mp3 diff --git a/public/audio/widget/ding.mp3 b/public/audio/widget/ding.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..7c190424bef8b6ca18378bfeb47edbf3cee6edff GIT binary patch literal 2667 zcmeHIYgAKL7Ctw*33&klc?60YAfqTqZ$MEj3>OIq2!atIJX(Uh1q4NkN;g?X~xJ?>^`3 zz0cbF_z9fJKnH$ExVMnd6hfR3CnQ85^m>;Dd-DlOC&Vi$W>0o{`W}2<5l7Jf3Q_XT zM8d(45EuXk0^Ht%wD;le`+&a>#96@so`K%Zj(h}xmA}QehRY)-1p-K;i=$`^tNrcA z|E$L6YXrbx3IHhv0FAf>!h~S=innFIMmH+p!3@_spab! zsH$fJ7invy6oLeKzs0&ER4177nl3|CTm`?kn009dvzqAzY93lxbE%K~Wk&=xF^F%( zzP<7E>sND++n0!nA=+wIh$Wcb~@gH2Sww!wqrKz@{V|$2Z8p3;V;926qr)gOc zZ#%1VRG0Cu`1|t+>DigE%loCj^7-_T-KismL)oDc^`QKj@kCPgK0$UILLr?5SfjX& zV`+7bO|v{9r;s59a}`C3^yvF$?1!lwnGaywjh-dhDc9eUp*}Y@e!jUnb0;J&I7+LG zf&0-1hQ-a}nlZy&c_zA69l}PV!Nzgo)~r#^456woj+%Z`h|!upiY>&r(E1Q7(>=>? z$3t9%#DZ)Qc0{>!o>{)lOe>uHa&DPPL7hSF)OB*t$L-Q7lBB_26w6rUOIw$*b|F%i ziK{j-{jHnBP0og{$9BawzkC92&o*hDXN762Cg&nV#rbm|*nmiv1x1bfhlKkqjyvGE z((f*A=E^rQBI&UclM*5H@U?Gso4o@&*~DLz_~o45<$rsDziJ@W0|=n0cTU~2g#ZQ& zs(W4;iPEl>e2eMw)2g37xTd+>~% zRa`RF$0;TLOtZ<37O1-}_erI5Ma%JczVVMGf}1Lvp$gdszgAJ?Qx)}MoeZZES7|jMiqe!V81!YZ_(cT?T7;sK=-0+68MV^2ATbJNGOZU z((w39$d-)$0}0cQr8lE&%qXX9yru57zb!Rm1qH6f+UR-U4aNqQENmQQ%23#s9PE|{ zs{t0TSCrTAus!3L*PubAi7Z*>3+mTLmZzFP@#rFCDQS?*)-S50V$D%ZHA97{k|+T% zX1Xa7ZDR|E>Jl3pT(+!(5hfjlS>yx~N-O>Wb)iDt=3nt+c!(17v?7qzmR6|Oe8t-@9k_~;`nY;Bb&l{C1k|pZ7Ac_0%NTw zx+^j*1`z}}Hh0F1Me*~3O1*`FWA=fHuNdp-wkf~R1S;;JGt$I{?o^!5w z`mrdtpt|T!RZC#sCqAAl2T~5*zhYZMn;EEC`{pe}&Y;u{zQX;ZDW^s*F#RN7t~mRw z;=?h|Fd1ek){upQr(bE&pmyxuc9)M<_PH~2Ml9-ETDE)_H4rYL8+6=nygg)I5GJqN zHtsQMGdmG{peHWlWkQu@*-%$P1-