From d9b4a5b8d94c9afe28a4fd2c54cf63008d882d1c Mon Sep 17 00:00:00 2001 From: Nuwan Date: Sat, 3 Dec 2022 02:21:47 +0530 Subject: [PATCH] fix async call issue in bands search window --- web/app/assets/javascripts/asyncJamClient.js | 44 ++++++++++++++----- .../member_search_filter.js.coffee | 5 +-- web/app/assets/javascripts/utils.js | 4 +- 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/web/app/assets/javascripts/asyncJamClient.js b/web/app/assets/javascripts/asyncJamClient.js index 21e2dcb75..115452778 100644 --- a/web/app/assets/javascripts/asyncJamClient.js +++ b/web/app/assets/javascripts/asyncJamClient.js @@ -447,6 +447,12 @@ logger.log( "[asyncJamClient] WebSocket connected, setting up QWebChannel." ); + const skipLogMethods = [ + 'getConnectionDetail' + ] + const displayLogMethod = [ + + ] new QWebChannel(socket, function (channel) { jkfrontendchannel = channel.objects.jkfrontendchannel; @@ -473,16 +479,23 @@ let req_id = msg.request_id; //frontend originated request let response = msg.response; let evt_id = msg.event_id; //backend originated async event + let methodName = msg.method_name; deferred = deferredQueue.find((d) => { return d.request_id === req_id; }); if (deferred) { - /** logger.log( - "[asyncJamClient] Message received via QWebChannel: " + - message - );*/ + if(skipLogMethods.length > 0 && skipLogMethods.includes(methodName)){ + }else{ + if(displayLogMethod.includes(methodName)){ + logger.log( + "[asyncJamClient] Message received via QWebChannel: " + + msg + ); + } + } + deferred.resolve(response); //remove this deferred object from queue deferredQueue = deferredQueue.filter( @@ -568,17 +581,26 @@ let deferred = new Deferred(appMessage.request_id); - const onlylogMethods = [ + + const skipLogMethods = [ + + ] + const displayLogMethod = [ 'SessionSetTrackVolumeData' ] - if(onlylogMethods.includes(prop)){ - logger.log( - "[asyncJamClient] diverting to backend:", - prop, - appMessage - ); + if(skipLogMethods.length > 0 && skipLogMethods.includes(prop)){ + }else{ + if(displayLogMethod.includes(prop)){ + logger.log( + "[asyncJamClient] diverting to backend:", + prop, + appMessage + ); + } } + + if (jkfrontendchannel) { try { diff --git a/web/app/assets/javascripts/member_search_filter.js.coffee b/web/app/assets/javascripts/member_search_filter.js.coffee index 2c0c60e43..5bf085a14 100644 --- a/web/app/assets/javascripts/member_search_filter.js.coffee +++ b/web/app/assets/javascripts/member_search_filter.js.coffee @@ -257,8 +257,7 @@ context.JK.MusicianSearchFilter = class MusicianSearchFilter extends BaseSearchF super(sFilter) - @searchFilter = JSON.parse(sFilter) - console.log('loadSearchFilter', sFilter, @searchFilter, this.filterData()) + @searchFilter = JSON.parse(sFilter) args = interests: this.filterData().interests skill_level: this.filterData().skill_level @@ -824,7 +823,7 @@ context.JK.BandSearchFilter = class BandSearchFilter extends BaseSearchFilter context.JK.bindHoverEvents() return - + _bindFollowBand: () => objThis = this @screen.find('.search-m-follow').on 'click', (evt) -> diff --git a/web/app/assets/javascripts/utils.js b/web/app/assets/javascripts/utils.js index e7aed81c2..eb22a1f28 100644 --- a/web/app/assets/javascripts/utils.js +++ b/web/app/assets/javascripts/utils.js @@ -664,8 +664,8 @@ }; - context.JK.resolveBandAvatarUrl = async function (photo_url) { - var client_type = await context.JK.clientType(); + context.JK.resolveBandAvatarUrl = function (photo_url) { + var client_type = context.JK.clientType(); if(client_type == 'browser') { return photo_url ? photo_url : "/assets/shared/avatar_generic_band.png"; }