MT#57305 CSC CFT feature requires +E.164 number format

Change-Id: I1d8201e40a1affd53d04a9e550ac492dbc1b9168
mr11.4
Marco Capetta 2 years ago
parent f2d08d862b
commit 7849c0dbc9

@ -20,9 +20,7 @@
v-if="mapping.type === 'cft'" v-if="mapping.type === 'cft'"
:loading="loading" :loading="loading"
:mapping="mapping" :mapping="mapping"
:destination-set="destinationSet" :primary-number-source="getPrimaryNumberSource"
:source-set="sourceSet"
:time-set="timeSet"
/> />
<csc-cf-group-item <csc-cf-group-item
v-for="(destination, destinationIndex) in destinationSet.destinations" v-for="(destination, destinationIndex) in destinationSet.destinations"
@ -53,6 +51,9 @@ import CscCfGroupTitle from 'components/call-forwarding/CscCfGroupTitle'
import CscCfGroupItem from 'components/call-forwarding/CscCfGroupItem' import CscCfGroupItem from 'components/call-forwarding/CscCfGroupItem'
import CscSpinner from 'components/CscSpinner' import CscSpinner from 'components/CscSpinner'
import CscCfGroupItemPrimaryNumber from 'components/call-forwarding/CscCfGroupItemPrimaryNumber' import CscCfGroupItemPrimaryNumber from 'components/call-forwarding/CscCfGroupItemPrimaryNumber'
import {
mapState
} from 'vuex'
export default { export default {
name: 'CscCfGroup', name: 'CscCfGroup',
@ -89,8 +90,22 @@ export default {
} }
}, },
computed: { computed: {
...mapState('pbxGroups', [
'groupSelected'
]),
...mapState('pbxSeats', [
'seatSelected'
]),
waitIdentifier () { waitIdentifier () {
return 'csc-cf-group-' + this.destinationSet.id return 'csc-cf-group-' + this.destinationSet.id
},
getPrimaryNumberSource () {
if (this.groupSelected) {
return this.groupSelected
} else if (this.seatSelected) {
return this.seatSelected
}
return null
} }
} }
} }

@ -34,8 +34,7 @@
<script> <script>
import { import {
mapGetters, mapGetters
mapState
} from 'vuex' } from 'vuex'
import CscSpinner from 'components/CscSpinner' import CscSpinner from 'components/CscSpinner'
import numberFilter from '../../filters/number' import numberFilter from '../../filters/number'
@ -47,18 +46,6 @@ export default {
type: Object, type: Object,
default: undefined default: undefined
}, },
destinationSet: {
type: Object,
default: undefined
},
sourceSet: {
type: Object,
default: undefined
},
timeSet: {
type: Object,
default: undefined
},
loading: { loading: {
type: Boolean, type: Boolean,
default: false default: false

@ -66,7 +66,7 @@
</q-item-section> </q-item-section>
</q-item> </q-item>
<csc-cf-group-item-primary-number <csc-cf-group-item-primary-number
:primary-number-source="groupSelected"/> :primary-number-source="getPrimaryNumberSource"/>
</q-list> </q-list>
<template <template
v-for="group in groups" v-for="group in groups"
@ -94,13 +94,6 @@ import {
mapGetters, mapGetters,
mapActions mapActions
} from 'vuex' } from 'vuex'
import {
RequestState
} from 'src/store/common'
import {
showGlobalError,
showToast
} from 'src/helpers/ui'
import CscCfGroup from 'components/call-forwarding/CscCfGroup' import CscCfGroup from 'components/call-forwarding/CscCfGroup'
import CscSpinner from 'components/CscSpinner' import CscSpinner from 'components/CscSpinner'
import CscPopupMenu from 'components/CscPopupMenu' import CscPopupMenu from 'components/CscPopupMenu'
@ -133,9 +126,10 @@ export default {
}, },
computed: { computed: {
...mapState('pbxGroups', [ ...mapState('pbxGroups', [
'groupSelected', 'groupSelected'
'groupUpdateState', ]),
'groupUpdateError' ...mapState('pbxSeats', [
'seatSelected'
]), ]),
...mapGetters('user', [ ...mapGetters('user', [
'hasSubscriberProfileAttribute', 'hasSubscriberProfileAttribute',
@ -148,15 +142,14 @@ export default {
'destinationSetMap', 'destinationSetMap',
'sourceSetMap', 'sourceSetMap',
'timeSetMap' 'timeSetMap'
]) ]),
}, getPrimaryNumberSource () {
watch: { if (this.groupSelected) {
groupUpdateState (state) { return this.groupSelected
if (state === RequestState.succeeded) { } else if (this.seatSelected) {
showToast(this.getGroupUpdateToastMessage) return this.seatSelected
} else if (state === RequestState.failed) {
showGlobalError(this.groupUpdateError)
} }
return null
} }
}, },
mounted () { mounted () {

Loading…
Cancel
Save