From a252fe21d8aeff8fe1fc1fed68f03f563ca360c7 Mon Sep 17 00:00:00 2001
From: Carlo Venusino <cvenusino@sipwise.com>
Date: Wed, 13 May 2020 15:31:27 +0200
Subject: [PATCH] TT#81165 CF: Can click a new type of forwarding group under
 "Add forwarding"

Change-Id: I4b03820b39fa940ee2d4543e08a8528812c88172
---
 ...NewCallForwardDestinationsetTypeSelect.vue | 30 +++++++++----------
 src/locales/en.json                           |  1 +
 src/store/new-call-forward.js                 | 20 +++++++++++++
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/components/pages/NewCallForward/CscNewCallForwardDestinationsetTypeSelect.vue b/src/components/pages/NewCallForward/CscNewCallForwardDestinationsetTypeSelect.vue
index b0020711..8e9260cd 100644
--- a/src/components/pages/NewCallForward/CscNewCallForwardDestinationsetTypeSelect.vue
+++ b/src/components/pages/NewCallForward/CscNewCallForwardDestinationsetTypeSelect.vue
@@ -9,6 +9,13 @@
         >
             {{ $t('pages.newCallForward.unconditionalLabel') }}
         </div>
+        <div
+            class="csc-cf-dest-type"
+            v-if="!unconditionalGroupExists && !timeoutFromGroupExists"
+            @click="addDestinationsetUnconditionalFrom()"
+        >
+            {{ $t('pages.newCallForward.unconditionalFromLabel') }}
+        </div>
         <div
             class="csc-cf-dest-type"
             v-if="!offlineGroupExists"
@@ -46,7 +53,9 @@
         computed: {
             ...mapGetters('newCallForward', [
                 'timeoutGroupExists',
+                'timeoutFromGroupExists',
                 'unconditionalGroupExists',
+                'unconditionalFromGroupExists',
                 'offlineGroupExists',
                 'busyGroupExists'
             ])
@@ -56,6 +65,10 @@
                 await this.$store.dispatch('newCallForward/setSelectedDestType', 'unconditional');
                 this.$parent.close()
             },
+            async addDestinationsetUnconditionalFrom(){
+                await this.$store.dispatch('newCallForward/setSelectedDestType', 'unconditional-from');
+                this.$parent.close()
+            },
             async addDestinationsetOffline(){
                 await this.$store.dispatch('newCallForward/setSelectedDestType', 'offline');
                 this.$parent.close()
@@ -64,22 +77,7 @@
                 await this.$store.dispatch('newCallForward/setSelectedDestType', 'busy');
                 this.$parent.close()
             },
-            // async checkTimeoutExisting(){
-            //     const group = await this.$store.dispatch('newCallForward/getForwardGroupByName', 'timeout');
-            //     this.timeoutExisting = !!group;
-            // },
-            // async checkUnconditionalExisting(){
-            //     const group = await this.$store.dispatch('newCallForward/getForwardGroupByName', 'unconditional');
-            //     this.unconditionalExisting = !!group;
-            // },
-            // async checkOfflineExisting(){
-            //     const group = await this.$store.dispatch('newCallForward/getForwardGroupByName', 'offline');
-            //     this.offlineExisting = !!group;
-            // },
-            // async checkBusyExisting(){
-            //     const group = await this.$store.dispatch('newCallForward/getForwardGroupByName', 'busy');
-            //     this.busyExisting = !!group;
-            // },
+
             cancel() {
                 this.enabled = false;
             },
diff --git a/src/locales/en.json b/src/locales/en.json
index ed53a757..b9642f77 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -230,6 +230,7 @@
             "cancelDialogTitle": "Delete from {groupName} forwarding",
             "cancelDialogText": "You are about to delete {destination} from {groupName} call forwarding",
             "unconditionalLabel": "If online",
+            "unconditionalFromLabel": "If online and call from ...",
             "offlineLabel": "If offline",
             "busyLabel": "If busy"
         },
diff --git a/src/store/new-call-forward.js b/src/store/new-call-forward.js
index 625841ae..342c2e02 100644
--- a/src/store/new-call-forward.js
+++ b/src/store/new-call-forward.js
@@ -16,10 +16,18 @@ const ForwardGroup = {
         name : 'csc-unconditional',
         mapping: 'cfu'
     },
+    unconditionalFrom: {
+        name: 'csc-unconditional-from',
+        mapping: 'cfu'
+    },
     timeout: {
         name: 'csc-timeout',
         mapping: 'cft'
     },
+    timeoutFrom: {
+        name: 'csc-timeout-from',
+        mapping: 'cft'
+    },
     offline: {
         name: 'csc-offline',
         mapping: 'cfna'
@@ -81,6 +89,18 @@ export default {
             });
             return group && group.length > 0;
         },
+        timeoutFromGroupExists(state){
+            const group = state.forwardGroups.filter(($group)=>{
+                return $group.name === 'csc-timeout-from'
+            });
+            return group && group.length > 0;
+        },
+        unconditionalFromGroupExists(state){
+            const group = state.forwardGroups.filter(($group)=>{
+                return $group.name === 'csc-unconditional-from'
+            });
+            return group && group.length > 0;
+        },
         offlineGroupExists(state){
             const group = state.forwardGroups.filter(($group)=>{
                 return $group.name === 'csc-offline'