From dd191ffb33a52e533e4a228e7bcd35df459ce374 Mon Sep 17 00:00:00 2001
From: Hans-Peter Herzog <hherzog@sipwise.com>
Date: Thu, 24 Sep 2020 11:00:32 +0200
Subject: [PATCH] TT#94801 Fix intra pbx flag in PBXConfig

Change-Id: I2dc59ee6092331eb74a7005e92864406b41fa8ec
---
 src/components/CscMainMenuTop.vue             |  9 ++-
 .../pages/Conference/CscConferenceJoin.vue    |  2 +-
 .../NewCallForward/CscCallForwardGroup.vue    |  2 +-
 .../NewCallForward/CscNewCallForward.vue      |  2 +-
 .../pages/PbxConfiguration/CscPbxDevices.vue  |  2 +-
 .../pages/PbxConfiguration/CscPbxGroups.vue   |  2 +-
 .../pages/PbxConfiguration/CscPbxSeat.vue     |  2 +-
 .../pages/PbxConfiguration/CscPbxSeats.vue    |  2 +-
 .../pages/PbxConfiguration/CscPbxSoundSet.vue |  2 +-
 .../PbxConfiguration/CscPbxSoundSetSound.vue  |  2 +-
 .../PbxConfiguration/CscPbxSoundSets.vue      |  2 +-
 .../pages/PbxSettings/CscPbxSettings.vue      | 66 +++++++++----------
 src/router/routes.js                          | 12 +++-
 13 files changed, 58 insertions(+), 49 deletions(-)

diff --git a/src/components/CscMainMenuTop.vue b/src/components/CscMainMenuTop.vue
index eeb8e340..4a5692ed 100644
--- a/src/components/CscMainMenuTop.vue
+++ b/src/components/CscMainMenuTop.vue
@@ -45,7 +45,8 @@ export default {
 	},
 	computed: {
 		...mapGetters('user', [
-			'isRtcEngineUiVisible'
+			'isRtcEngineUiVisible',
+			'isPbxEnabled'
 		]),
 		items () {
 			return [
@@ -182,6 +183,12 @@ export default {
 							visible: true
 						}
 					]
+				},
+				{
+					to: '/user/pbx-settings',
+					icon: 'settings',
+					label: this.$t('navigation.pbxSettings.title'),
+					visible: this.isPbxEnabled
 				}
 			]
 		}
diff --git a/src/components/pages/Conference/CscConferenceJoin.vue b/src/components/pages/Conference/CscConferenceJoin.vue
index c3e559dc..d124f131 100644
--- a/src/components/pages/Conference/CscConferenceJoin.vue
+++ b/src/components/pages/Conference/CscConferenceJoin.vue
@@ -19,7 +19,7 @@
 			:value="conferenceIdInput"
 			:placeholder="$t('conferencing.idPlaceholder')"
 			:disable="isJoining || !hasRtcEngineCapabilityEnabled"
-			@change="conferenceIdChanged"
+			@input="conferenceIdChanged"
 		>
 			<template
 				v-slot:prepend
diff --git a/src/components/pages/NewCallForward/CscCallForwardGroup.vue b/src/components/pages/NewCallForward/CscCallForwardGroup.vue
index 31df6379..649ea783 100644
--- a/src/components/pages/NewCallForward/CscCallForwardGroup.vue
+++ b/src/components/pages/NewCallForward/CscCallForwardGroup.vue
@@ -212,7 +212,7 @@
 			<div class="col text-left col-xs-12 col-md-2 csc-cf-dest-number-cont">
 				<q-toggle
 					v-model="isEnabled"
-					@change="toggleGroupChange"
+					@input="toggleGroupChange"
 				/>
 			</div>
 			<div class="col col-xs-12 col-md-5 csc-cf-group-actions">
diff --git a/src/components/pages/NewCallForward/CscNewCallForward.vue b/src/components/pages/NewCallForward/CscNewCallForward.vue
index 322f643a..efeda645 100644
--- a/src/components/pages/NewCallForward/CscNewCallForward.vue
+++ b/src/components/pages/NewCallForward/CscNewCallForward.vue
@@ -23,7 +23,7 @@
 				<q-toggle
 					v-if="forwardGroups.length > 0"
 					v-model="toggleDefaultNumber"
-					@change="toggleChange"
+					@input="toggleChange"
 				/>
 			</div>
 			<div
diff --git a/src/components/pages/PbxConfiguration/CscPbxDevices.vue b/src/components/pages/PbxConfiguration/CscPbxDevices.vue
index bf05b4f5..fed825cd 100644
--- a/src/components/pages/PbxConfiguration/CscPbxDevices.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxDevices.vue
@@ -69,7 +69,7 @@
 			<q-pagination
 				:value="deviceListCurrentPage"
 				:max="deviceListLastPage"
-				@change="loadDeviceListItemsFiltered"
+				@input="loadDeviceListItemsFiltered"
 			/>
 		</div>
 		<csc-list-spinner
diff --git a/src/components/pages/PbxConfiguration/CscPbxGroups.vue b/src/components/pages/PbxConfiguration/CscPbxGroups.vue
index 5b7e7c52..294bf870 100644
--- a/src/components/pages/PbxConfiguration/CscPbxGroups.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxGroups.vue
@@ -40,7 +40,7 @@
 			<q-pagination
 				:value="groupListCurrentPage"
 				:max="groupListLastPage"
-				@change="loadGroupListItemsPaginated"
+				@input="loadGroupListItemsPaginated"
 			/>
 		</div>
 		<csc-list-spinner
diff --git a/src/components/pages/PbxConfiguration/CscPbxSeat.vue b/src/components/pages/PbxConfiguration/CscPbxSeat.vue
index 063c67ae..20ec7f9b 100644
--- a/src/components/pages/PbxConfiguration/CscPbxSeat.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxSeat.vue
@@ -201,7 +201,7 @@
 				class="q-pa-sm"
 				:label="$t('pbxConfig.toggleIntraPbx')"
 				:disable="loading"
-				@change="changeIntraPbx"
+				@input="changeIntraPbx"
 			/>
 			<q-btn
 				v-if="hasCallQueue"
diff --git a/src/components/pages/PbxConfiguration/CscPbxSeats.vue b/src/components/pages/PbxConfiguration/CscPbxSeats.vue
index 601b9fcd..c3463091 100644
--- a/src/components/pages/PbxConfiguration/CscPbxSeats.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxSeats.vue
@@ -113,7 +113,7 @@
 			<q-pagination
 				:value="seatListCurrentPage"
 				:max="seatListLastPage"
-				@change="loadSeatListItemsPaginated"
+				@input="loadSeatListItemsPaginated"
 			/>
 		</div>
 		<div
diff --git a/src/components/pages/PbxConfiguration/CscPbxSoundSet.vue b/src/components/pages/PbxConfiguration/CscPbxSoundSet.vue
index bd16cdee..2c2d4da4 100644
--- a/src/components/pages/PbxConfiguration/CscPbxSoundSet.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxSoundSet.vue
@@ -79,7 +79,7 @@
 			<q-checkbox
 				:label="$t('pbxConfig.soundSetDefault')"
 				:value="soundSet.contract_default"
-				@change="saveAsDefault"
+				@input="saveAsDefault"
 			/>
 			<csc-list-spinner
 				v-if="soundHandlesLoading || soundFilesLoading"
diff --git a/src/components/pages/PbxConfiguration/CscPbxSoundSetSound.vue b/src/components/pages/PbxConfiguration/CscPbxSoundSetSound.vue
index 6f2e9a3c..99bb6fc7 100644
--- a/src/components/pages/PbxConfiguration/CscPbxSoundSetSound.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxSoundSetSound.vue
@@ -25,7 +25,7 @@
 						ref="fileUpload"
 						accept=".wav,.mp3,.ogg"
 						type="file"
-						@change="selectFile"
+						@input="selectFile"
 					>
 					<q-icon
 						v-if="soundFile || selectedFile"
diff --git a/src/components/pages/PbxConfiguration/CscPbxSoundSets.vue b/src/components/pages/PbxConfiguration/CscPbxSoundSets.vue
index 9f7d2bf0..b8c751d3 100644
--- a/src/components/pages/PbxConfiguration/CscPbxSoundSets.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxSoundSets.vue
@@ -34,7 +34,7 @@
 			<q-pagination
 				:value="soundSetListCurrentPage"
 				:max="soundSetListLastPage"
-				@change="loadSoundSetListPaginated"
+				@input="loadSoundSetListPaginated"
 			/>
 		</div>
 		<csc-list-spinner
diff --git a/src/components/pages/PbxSettings/CscPbxSettings.vue b/src/components/pages/PbxSettings/CscPbxSettings.vue
index 268178eb..3e71290b 100644
--- a/src/components/pages/PbxSettings/CscPbxSettings.vue
+++ b/src/components/pages/PbxSettings/CscPbxSettings.vue
@@ -1,31 +1,32 @@
 
 <template>
 	<csc-page
-		class="csc-simple-page"
+		class="q-pa-lg"
 	>
-		<div
-			class="row"
-		>
-			<div
-				class="col col-xs-12 col-md-12"
-			>
-				<q-toggle
-					v-model="clirIntrapbx"
-					:disabled="isLoading"
-					class="csc-pbx-settings-toggle"
-					:label="clirIntrapbx ? $t('pbxConfig.selfPbxHidden') : $t('pbxConfig.selfPbxVisible')"
-					checked-icon="visibility_off"
-					unchecked-icon="visibility"
-					@change="changeIntraPbx"
-				/>
-				<q-spinner-dots
-					v-if="isLoading"
-					class="csc-pbx-settings-spinner"
-					color="primary"
-					:size="24"
-				/>
-			</div>
-		</div>
+		<q-list>
+			<q-item>
+				<q-item-section
+					side
+				>
+					<q-toggle
+						v-model="clirIntrapbx"
+						:disabled="isLoading"
+						class="csc-pbx-settings-toggle"
+						:label="clirIntrapbx ? $t('pbxConfig.selfPbxHidden') : $t('pbxConfig.selfPbxVisible')"
+						checked-icon="visibility_off"
+						unchecked-icon="visibility"
+						@input="changeIntraPbx"
+					/>
+				</q-item-section>
+				<q-item-section
+					class="text-right"
+				>
+					<csc-spinner
+						v-if="isLoading"
+					/>
+				</q-item-section>
+			</q-item>
+		</q-list>
 	</csc-page>
 </template>
 
@@ -39,8 +40,11 @@ import {
 import {
 	RequestState
 } from 'src/store/common'
+import CscSpinner from 'components/CscSpinner'
+import { getSubscriberId } from 'src/auth'
 export default {
 	components: {
+		CscSpinner,
 		CscPage
 	},
 	data () {
@@ -51,8 +55,7 @@ export default {
 	},
 	async mounted () {
 		this.requestInProgress(true)
-		const subscriberId = localStorage.getItem('subscriberId')
-		const preferences = await this.loadPreferences(subscriberId)
+		const preferences = await this.loadPreferences(getSubscriberId())
 		this.clirIntrapbx = preferences.clir_intrapbx
 		this.requestInProgress(false)
 	},
@@ -90,7 +93,7 @@ export default {
 		changeIntraPbx () {
 			const msg = this.clirIntrapbx ? this.$t('pbxConfig.selfPbxHidden') : this.$t('pbxConfig.selfPbxVisible')
 			this.setIntraPbx({
-				seatId: localStorage.getItem('subscriberId'),
+				seatId: getSubscriberId(),
 				intraPbx: this.clirIntrapbx,
 				message: msg
 			})
@@ -101,12 +104,3 @@ export default {
 	}
 }
 </script>
-
-<style lang="stylus" rel="stylesheet/stylus">
-    @import '../../../themes/quasar.variables';
-    .csc-pbx-settings-toggle
-        margin-top 18px
-    .csc-pbx-settings-spinner
-        margin-left 10px
-        padding-top 18px
-</style>
diff --git a/src/router/routes.js b/src/router/routes.js
index a0b0d911..8e83c3c8 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -18,6 +18,7 @@ import PbxConfigurationDevices from 'src/components/pages/PbxConfiguration/CscPb
 import PbxConfigurationCallQueues from 'src/components/pages/PbxConfiguration/CscPbxCallQueues'
 import PbxConfigurationSoundSets from 'src/components/pages/PbxConfiguration/CscPbxSoundSets'
 import PbxConfigurationMsConfigs from 'src/components/pages/PbxConfiguration/CscPbxMsConfigs'
+import CscPbxSettings from 'src/components/pages/PbxSettings/CscPbxSettings'
 import Voicebox from 'src/components/pages/Voicebox/CscPageVoicebox'
 import Login from 'src/components/CscPageLogin'
 import CscUserSettings from 'src/components/pages/CscUserSettings'
@@ -176,6 +177,14 @@ export default function routes (app) {
 						title: i18n.t('navigation.userSettings.title'),
 						subtitle: i18n.t('navigation.userSettings.subTitle')
 					}
+				},
+				{
+					path: 'pbx-settings',
+					component: CscPbxSettings,
+					meta: {
+						title: i18n.t('navigation.pbxSettings.title'),
+						subtitle: i18n.t('navigation.pbxSettings.subTitle')
+					}
 				}
 			]
 		},
@@ -221,7 +230,6 @@ export default function routes (app) {
 // 			{ path: '', component: () => import('pages/Index.vue') }
 // 		]
 // 	},
-//
 // 	// Always leave this as last one,
 // 	// but you can also remove it
 // 	{
@@ -229,5 +237,5 @@ export default function routes (app) {
 // 		component: () => import('pages/Error404.vue')
 // 	}
 // ]
-
+//
 // export default routes