From 0894dfe583a920cc732170dc1308868015b7c01a Mon Sep 17 00:00:00 2001 From: Hans-Peter Herzog Date: Wed, 22 Jun 2022 10:25:44 +0200 Subject: [PATCH] TT#179952 Call - Hide "CSC Calls" functionality if subscriber profile csc_calls is not set Change-Id: Ia6e03f104e5c7591716dc8b85c541058b2a77cb0 --- src/components/CscMainMenuTop.vue | 2 +- src/constants.js | 3 ++- src/layouts/CscLayoutMain.vue | 10 ++++++++-- src/router/routes.js | 3 ++- src/store/user.js | 17 ++++++++++------- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/components/CscMainMenuTop.vue b/src/components/CscMainMenuTop.vue index ce96e1a6..503f2548 100644 --- a/src/components/CscMainMenuTop.vue +++ b/src/components/CscMainMenuTop.vue @@ -67,7 +67,7 @@ export default { icon: 'call', label: this.callStateTitle, sublabel: this.callStateSubtitle, - visible: true + visible: this.hasSubscriberProfileAttribute(PROFILE_ATTRIBUTE_MAP.cscCalls) }, { to: '/user/conversations', diff --git a/src/constants.js b/src/constants.js index 72fb6c98..2c772948 100644 --- a/src/constants.js +++ b/src/constants.js @@ -12,7 +12,8 @@ export const PROFILE_ATTRIBUTE_MAP = { voiceMail: 'voice_mail', callBlockingPrivacy: 'clir', faxServer: 'fax_server', - pbxSettings: 'clir_intrapbx' + pbxSettings: 'clir_intrapbx', + cscCalls: 'csc_calls' } export const PROFILE_ATTRIBUTES_MAP = { diff --git a/src/layouts/CscLayoutMain.vue b/src/layouts/CscLayoutMain.vue index 5c356b27..3cf0b085 100644 --- a/src/layouts/CscLayoutMain.vue +++ b/src/layouts/CscLayoutMain.vue @@ -156,6 +156,7 @@ v-model="faxDialog" /> { + this.$refs.call.fitMedia() + }) + } }, pinMenu () { this.menuPinned = !this.menuPinned diff --git a/src/router/routes.js b/src/router/routes.js index 76bf8693..8a18f2c6 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -61,7 +61,8 @@ export default function routes (app) { meta: { get title () { return i18n.t('Start new call') - } + }, + subscriberProfile: ['csc_calls'] } }, { diff --git a/src/store/user.js b/src/store/user.js index 7ef65d81..cec8a879 100644 --- a/src/store/user.js +++ b/src/store/user.js @@ -27,6 +27,7 @@ import { date } from 'quasar' import { callInitialize } from 'src/api/ngcp-call' import { setLocal } from 'src/storage' import { getSipInstanceId } from 'src/helpers/call-utils' +import { PROFILE_ATTRIBUTE_MAP } from 'src/constants' export default { namespaced: true, @@ -318,13 +319,15 @@ export default { const profile = await getSubscriberProfile(userData.subscriber.profile_id) context.commit('setProfile', profile) } - try { - await callInitialize({ - subscriber: userData.subscriber, - instanceId: getSipInstanceId() - }) - } catch (err) { - console.log(err) + if (context.getters.hasSubscriberProfileAttribute(PROFILE_ATTRIBUTE_MAP.cscCalls)) { + try { + await callInitialize({ + subscriber: userData.subscriber, + instanceId: getSipInstanceId() + }) + } catch (err) { + console.log(err) + } } await context.dispatch('forwardHome') } catch (err) {