From 8d63e41a4c7becb975fd3c68deb21e0f1e51e265 Mon Sep 17 00:00:00 2001
From: Debora Crescenzo <dcrescenzo@sipwise.com>
Date: Tue, 13 May 2025 11:44:07 +0100
Subject: [PATCH] MT#62760 After Ring timeout CFSeat bugfix

If a pilot admin subscriber tries to change
the After Ring timeout for CFU set on one
of the seats, the CF config crashes
and change is not applied. This happens
because we are not passing the
subscriber_id of the Seat. In fact the
change in the CF is applied to the logged
in user instead. In this commit we pass
the subscriber_id attribute down the three
and improve the error handling.

Change-Id: I27b34a095263d18ca8d00b98bc3a528b4ee35f42
(cherry picked from commit f80f5974a0cccf0b8aa5bcc8db31c5b81cae5343)
---
 src/components/CscPopupMenuRingTimeout.vue         | 14 ++++++++++++--
 .../pages/CallForward/CscCallForwardDetails.vue    |  1 +
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/CscPopupMenuRingTimeout.vue b/src/components/CscPopupMenuRingTimeout.vue
index e8be399d..6ccd9255 100644
--- a/src/components/CscPopupMenuRingTimeout.vue
+++ b/src/components/CscPopupMenuRingTimeout.vue
@@ -47,6 +47,7 @@
 
 <script>
 import CscInput from 'components/form/CscInput'
+import { showGlobalError } from 'src/helpers/ui'
 import { mapActions } from 'vuex'
 export default {
     name: 'CscPopupMenuRingTimeout',
@@ -55,6 +56,10 @@ export default {
         ringTimeout: {
             type: Number,
             required: true
+        },
+        subscriberId: {
+            type: [Number, String],
+            required: true
         }
     },
     data () {
@@ -70,8 +75,13 @@ export default {
         ]),
         async updateRingTimeoutEvent (event) {
             this.$wait.start('csc-cf-mappings-full')
-            await this.updateRingTimeout({ ringTimeout: event, subscriberId: this.subscriberId })
-            this.$wait.end('csc-cf-mappings-full')
+            try {
+                await this.updateRingTimeout({ ringTimeout: event, subscriberId: this.subscriberId })
+            } catch (err) {
+                showGlobalError(err.message)
+            } finally {
+                this.$wait.end('csc-cf-mappings-full')
+            }
         }
     }
 }
diff --git a/src/components/pages/CallForward/CscCallForwardDetails.vue b/src/components/pages/CallForward/CscCallForwardDetails.vue
index 6a9af3b6..b358ceed 100644
--- a/src/components/pages/CallForward/CscCallForwardDetails.vue
+++ b/src/components/pages/CallForward/CscCallForwardDetails.vue
@@ -70,6 +70,7 @@
                 <csc-popup-menu-ring-timeout
                     v-if="isRingTimeoutVisible"
                     :ring-timeout="ringTimeout"
+                    :subscriber-id="id"
                 />
                 <div
                     v-for="group in groups"