From 8ec406dad0f95db463a2eeb31b39caa3928ffba3 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 21 Jan 2025 15:08:09 +0530 Subject: [PATCH 1/2] fix: session user is not loading --- .../src/components/Telephony/ExotelCallUI.vue | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/frontend/src/components/Telephony/ExotelCallUI.vue b/frontend/src/components/Telephony/ExotelCallUI.vue index bb7844fa6..3408d11ce 100644 --- a/frontend/src/components/Telephony/ExotelCallUI.vue +++ b/frontend/src/components/Telephony/ExotelCallUI.vue @@ -253,7 +253,6 @@ import { ref, onBeforeUnmount, watch, nextTick } from 'vue' import { useRouter } from 'vue-router' const { $socket } = globalStore() -const { user } = sessionStore() const callPopupHeader = ref(null) const showCallPopup = ref(false) @@ -298,11 +297,14 @@ const getContact = createResource({ }, }) -watch(phoneNumber, (value) => { - if (!value) return - getContact.fetch() -}, { immediate: true }) - +watch( + phoneNumber, + (value) => { + if (!value) return + getContact.fetch() + }, + { immediate: true }, +) const dirty = ref(false) @@ -427,12 +429,13 @@ function setup() { console.log(data) callStatus.value = updateStatus(data) + const { user } = sessionStore() if ( !showCallPopup.value && !showSmallCallPopup.value && data.AgentEmail && - data.AgentEmail == user.value + data.AgentEmail == (user || user.value) ) { phoneNumber.value = data.CallTo || data.To showCallPopup.value = true From 2cfaf383d8a35e95394a24f7f678ee16c0f78591 Mon Sep 17 00:00:00 2001 From: Md Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:09:42 +0530 Subject: [PATCH 2/2] chore: stable tag for docker image --- .github/workflows/builds.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index b130ab967..a47eebfa0 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -46,6 +46,7 @@ jobs: - name: Set Image Tag run: | echo "IMAGE_TAG=${{ github.ref_name == 'develop' && 'latest' || 'v15' }}" >> $GITHUB_ENV + echo "STABLE_TAG=${{ github.ref_name == 'develop' && 'nightly' || 'stable' }}" >> $GITHUB_ENV - uses: actions/checkout@v4 with: @@ -60,7 +61,9 @@ jobs: file: builds/images/layered/Containerfile tags: > ghcr.io/${{ github.repository }}:${{ github.ref_name }}, - ghcr.io/${{ github.repository }}:${{ env.IMAGE_TAG }} + ghcr.io/${{ github.repository }}:${{ env.IMAGE_TAG }}, + ghcr.io/${{ github.repository }}:${{ env.STABLE_TAG }} + build-args: | "FRAPPE_BRANCH=${{ env.FRAPPE_BRANCH }}" "APPS_JSON_BASE64=${{ env.APPS_JSON_BASE64 }}"