From da0da9d7552fcbb503e63af202cfafd6ec5295c2 Mon Sep 17 00:00:00 2001
From: Robert Axelsen <raxelsen@sipwise.com>
Date: Mon, 25 Feb 2019 11:09:53 +0100
Subject: [PATCH] TT#53607 Remove '+' symbol on logs and outgoing

Change-Id: If3319c129616c4ff2d2686a7b750c1a0a0f1facb
---
 src/components/call/CscCall.vue               |  9 ++-
 src/components/layouts/Default.vue            |  6 --
 .../pages/Conversations/CscFaxItem.vue        |  9 ++-
 src/filters/number-format.js                  | 60 +++----------------
 src/filters/number.js                         | 18 +-----
 t/unit/number-format.js                       | 32 ++--------
 6 files changed, 26 insertions(+), 108 deletions(-)

diff --git a/src/components/call/CscCall.vue b/src/components/call/CscCall.vue
index c4d003d3..2850818e 100644
--- a/src/components/call/CscCall.vue
+++ b/src/components/call/CscCall.vue
@@ -46,13 +46,16 @@
                             />
                             <span
                                 v-if="isInitiating"
-                            >{{ $t('call.initiating', {number: callNumberFormatted}) }}</span>
+                            >
+                                {{ $t('call.initiating', {number: callNumberFormatted}) }}</span>
                             <span
                                 v-else-if="isRinging"
-                            >{{ $t('call.ringing', {number: callNumberFormatted}) }}</span>
+                            >
+                                {{ $t('call.ringing', {number: callNumberFormatted}) }}</span>
                             <span
                                 v-else-if="isIncoming"
-                            >{{ $t('call.incoming', {number: callNumberFormatted}) }}</span>
+                            >
+                                {{ $t('call.incoming', {number: callNumberFormatted}) }}</span>
                         </div>
                         <div
                             v-else-if="isEnded"
diff --git a/src/components/layouts/Default.vue b/src/components/layouts/Default.vue
index 3821d5f8..949ed2cc 100644
--- a/src/components/layouts/Default.vue
+++ b/src/components/layouts/Default.vue
@@ -156,9 +156,6 @@
 </template>
 
 <script>
-    import {
-        normalizeDestination
-    } from '../../filters/number-format'
     import platformMixin from '../../mixins/platform'
     import {
         startLoading,
@@ -305,9 +302,6 @@
                 }
                 return classes;
             },
-            callNumberFormatted() {
-                return normalizeDestination(this.callNumber);
-            },
             pageTitleExt() {
                 if(this.isHome) {
                     return this.callStateTitle;
diff --git a/src/components/pages/Conversations/CscFaxItem.vue b/src/components/pages/Conversations/CscFaxItem.vue
index c0adfa7b..ae1b4522 100644
--- a/src/components/pages/Conversations/CscFaxItem.vue
+++ b/src/components/pages/Conversations/CscFaxItem.vue
@@ -14,18 +14,21 @@
                 <span class="gt-sm csc-entity-title">
                     {{ direction }}
                 </span>
-                <span class="csc-entity-title">
+                <span class="csc-entity-title csc-phone-number">
                     {{ fax.caller | numberFormat }}
                 </span>
             </q-item-tile>
             <q-item-tile
                 sublabel
-            >{{ fax.start_time | smartTime }}
+            >
+                {{ fax.start_time | smartTime }}
             </q-item-tile>
             <q-item-tile
                 v-if="fax.pages === 0"
                 sublabel
-            >No pages</q-item-tile>
+            >
+                No pages
+            </q-item-tile>
             <q-item-tile
                 v-else-if="fax.pages === 1"
                 sublabel
diff --git a/src/filters/number-format.js b/src/filters/number-format.js
index 1ba5aaaa..ca3c3451 100644
--- a/src/filters/number-format.js
+++ b/src/filters/number-format.js
@@ -1,12 +1,6 @@
 
 import _ from 'lodash';
 import url from 'url';
-import {
-    PhoneNumberUtil,
-    PhoneNumberFormat
-} from 'google-libphonenumber';
-
-var phoneUtil = PhoneNumberUtil.getInstance();
 
 const DestinationHosts = {
     VoiceBox: 'voicebox.local',
@@ -17,49 +11,9 @@ const DestinationHosts = {
 };
 
 export default function numberFormat(number) {
-    try {
-        let destination = url.parse(number, true);
-        let extractedNumber = destination.auth.split(':')[0];
-        let normalizedNumber = normalizeNumber(extractedNumber);
-        if(normalizedNumber !== extractedNumber) {
-            return normalizedNumber;
-        }
-        else {
-            return extractedNumber;
-        }
-    }
-    catch(err) {
-        return normalizeNumber(number);
-    }
-}
-
-export function normalizeNumber(number, excludeLibPhoneNumber) {
-    if(_.isString(number)) {
-        let normalizedNumber = number.replace(/\s*/g, '');
-        if(normalizedNumber.match(/^\+?[0-9]+$/)) {
-            if(normalizedNumber.match(/^\+/) === null) {
-                normalizedNumber = '+' + normalizedNumber;
-            }
-            if(excludeLibPhoneNumber === true) {
-                return normalizedNumber;
-            }
-            else {
-                try {
-                    return phoneUtil.format(phoneUtil.parse(normalizedNumber, 'DE'),
-                        PhoneNumberFormat.INTERNATIONAL);
-                }
-                catch(err) {
-                    return normalizedNumber;
-                }
-            }
-        }
-        else {
-            return number;
-        }
-    }
-    else {
-        return number;
-    }
+    let destination = url.parse(number, true);
+    let extractedNumber = destination.auth ? destination.auth.split(':')[0] : destination.pathname;
+    return extractedNumber;
 }
 
 export function rawNumber(number) {
@@ -70,7 +24,7 @@ export function normalizeDestination(destination) {
     try {
 
         destination = destination.replace(/\s*/g, '');
-        if(destination.match(/^sip:/g) === null && destination.match(/^sips:/g) === null &&
+        if (destination.match(/^sip:/g) === null && destination.match(/^sips:/g) === null &&
             destination.match(/^\+?[0-9]+$/) === null) {
             destination = 'sip:' + destination;
         }
@@ -78,7 +32,7 @@ export function normalizeDestination(destination) {
         let parsedDestination = url.parse(destination, true);
         let authParts = parsedDestination.auth.split(':');
         let host = parsedDestination.host;
-        let normalizedNumber = normalizeNumber(authParts[0]);
+        let normalizedNumber = authParts[0];
         let isNumber = normalizedNumber !== authParts[0];
 
         if (host === DestinationHosts.VoiceBox) {
@@ -106,8 +60,8 @@ export function normalizeDestination(destination) {
             return normalizedNumber;
         }
     }
-    catch(err) {
-        return normalizeNumber(destination);
+    catch (err) {
+        return destination;
     }
 }
 
diff --git a/src/filters/number.js b/src/filters/number.js
index 56ee84ff..3180c3cd 100644
--- a/src/filters/number.js
+++ b/src/filters/number.js
@@ -1,22 +1,10 @@
 
-import _ from 'lodash';
-import { normalizeNumber } from './number-format'
-
 export default function(number, extension) {
     let constructedNumber = "" + number.cc + number.ac + number.sn;
-    let normalizedNumber = normalizeNumber(constructedNumber);
-    let finalNumber;
-    if(_.isString(normalizedNumber)) {
-        finalNumber = normalizedNumber;
+    if (extension) {
+        return constructedNumber.replace(new RegExp(extension + '$'), '');
     }
     else {
-        finalNumber = constructedNumber;
-    }
-    if(extension) {
-        return finalNumber.replace(new RegExp(extension + '$'), '');
+        return constructedNumber;
     }
-    else {
-        return finalNumber;
-    }
-
 }
diff --git a/t/unit/number-format.js b/t/unit/number-format.js
index 5154a3fd..7330609f 100644
--- a/t/unit/number-format.js
+++ b/t/unit/number-format.js
@@ -2,21 +2,12 @@
 
 import { assert } from 'chai';
 import numberFormat from '../../src/filters/number-format';
-import { normalizeNumber, normalizeDestination } from '../../src/filters/number-format';
+import { normalizeDestination } from '../../src/filters/number-format';
 
 const numbers = {
-    valid1: '+43 993 004',
-    valid2: '43993004',
-    valid3: ' 43993004 ',
-    valid4: '+43993004',
-    valid5: '43 993 004',
-    valid6: '4 3 9 9 3 0 0 4',
-    valid7: '+4 3 9 9 3 0 0 4',
-    valid8: ' +43993004 ',
+    valid1: '43993004',
     invalid1: '43993004+',
-    invalid2: '$43993004',
-    invalid3: 'a43993004',
-    invalid4: 'abcdefghi'
+    invalid2: 'a43993004',
 };
 
 const sipUris = {
@@ -36,24 +27,9 @@ const destinations = {
 
 describe('NumberFormatFilter', function() {
 
-    it('should normalize phone numbers', function(){
-        assert.equal(normalizeNumber(numbers.valid1), numbers.valid1);
-        assert.equal(normalizeNumber(numbers.valid2), numbers.valid1);
-        assert.equal(normalizeNumber(numbers.valid3), numbers.valid1);
-        assert.equal(normalizeNumber(numbers.valid4), numbers.valid1);
-        assert.equal(normalizeNumber(numbers.valid5), numbers.valid1);
-        assert.equal(normalizeNumber(numbers.valid6), numbers.valid1);
-        assert.equal(normalizeNumber(numbers.valid7), numbers.valid1);
-        assert.equal(normalizeNumber(numbers.valid8), numbers.valid1);
-        assert.equal(normalizeNumber(numbers.invalid1), numbers.invalid1);
-        assert.equal(normalizeNumber(numbers.invalid2), numbers.invalid2);
-        assert.equal(normalizeNumber(numbers.invalid3), numbers.invalid3);
-        assert.equal(normalizeNumber(numbers.invalid4), numbers.invalid4);
-    });
-
     it('should format a number or sip uri', function(){
         assert.equal(numberFormat(sipUris.valid1), numbers.valid1);
-        assert.equal(numberFormat(sipUris.invalid1), numbers.invalid3);
+        assert.equal(numberFormat(sipUris.invalid1), numbers.invalid2);
     });
 
     it('should format a call forward destination', function(){