diff --git a/src/components/call-forwarding/CscCfGroupTitle.vue b/src/components/call-forwarding/CscCfGroupTitle.vue index a71f0677..16a59e4e 100644 --- a/src/components/call-forwarding/CscCfGroupTitle.vue +++ b/src/components/call-forwarding/CscCfGroupTitle.vue @@ -388,6 +388,9 @@ export default { ...mapState('user', [ 'platformInfo' ]), + ...mapState('callForwarding', [ + 'announcements' + ]), clickableClasses () { return ['cursor-pointer', 'text-weight-bold', 'text-primary'] }, @@ -412,6 +415,10 @@ export default { ]), async addDestinationEvent (payload) { this.$wait.start(this.waitIdentifier) + payload.defaultAnnouncementId = null + if (_.isArray(this.announcements) && this.announcements.length > 0) { + payload.defaultAnnouncementId = this.announcements[0].value + } await this.addDestination(payload) this.$wait.end(this.waitIdentifier) }, diff --git a/src/store/call-forwarding/actions.js b/src/store/call-forwarding/actions.js index 2ed22ab2..62da2ea6 100644 --- a/src/store/call-forwarding/actions.js +++ b/src/store/call-forwarding/actions.js @@ -29,16 +29,15 @@ import _ from 'lodash' const DEFAULT_RING_TIMEOUT = 60 const DEFAULT_PRIORITY = 0 const WAIT_IDENTIFIER = 'csc-cf-mappings-full' -const DEFAULT_CUSTOM_ANNOUNCEMENT_ID = 255 // TODO get from endpoint -function createDefaultDestination (destination) { +function createDefaultDestination (destination, defaultAnnouncementId) { const payload = { destination: destination || ' ', priority: DEFAULT_PRIORITY, timeout: DEFAULT_RING_TIMEOUT } if (destination === 'customhours') { - payload.announcement_id = DEFAULT_CUSTOM_ANNOUNCEMENT_ID + payload.announcement_id = defaultAnnouncementId } return payload } @@ -149,7 +148,7 @@ export async function updateDestination ({ dispatch, commit, state, rootGetters export async function addDestination ({ dispatch, commit, state, rootGetters }, payload) { dispatch('wait/start', WAIT_IDENTIFIER, { root: true }) const destinations = _.cloneDeep(state.destinationSetMap[payload.destinationSetId].destinations) - destinations.push(createDefaultDestination(payload.destination)) + destinations.push(createDefaultDestination(payload.destination, payload.defaultAnnouncementId)) await patchReplace({ resource: 'cfdestinationsets', resourceId: payload.destinationSetId,