Merge branch 'warmfix_vnLinkPhone' into test

src/components/ui/CardSummary.vue

@@ -159,6 +159,7 @@ async function fetch() {
                 display: flex;
                 flex-direction: row;
                 margin-top: 2px;
+                align-items: start;
                 .label {
                     color: var(--vn-label-color);
                     width: 9em;
@@ -169,6 +170,10 @@ async function fetch() {
                     flex-grow: 0;
                     flex-shrink: 0;
                 }
+                &.ellipsis > .value {
+                    text-overflow: ellipsis;
+                    white-space: pre;
+                }
                 .value {
                     color: var(--vn-text-color);
                     overflow: hidden;

src/components/ui/VnDescriptor.vue

@@ -252,6 +252,10 @@ const toModule = computed(() => {
                 content: ':';
             }
         }
+        &.ellipsis > .value {
+            text-overflow: ellipsis;
+            white-space: pre;
+        }
         .value {
             color: var(--vn-text-color);
             font-size: 14px;

src/components/ui/VnLinkMail.vue

@@ -1,8 +1,11 @@
 <script setup>
+import { dashIfEmpty } from 'src/filters';
+
 defineProps({ email: { type: [String], default: null } });
 </script>
 <template>
     <QBtn
+        class="q-pr-xs"
         v-if="email"
         flat
         round
@@ -13,4 +16,5 @@ defineProps({ email: { type: [String], default: null } });
         :href="`mailto:${email}`"
         @click.stop
     />
+    <span>{{ dashIfEmpty(email) }}</span>
 </template>

src/components/ui/VnLinkPhone.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
 import axios from 'axios';
-import { parsePhone } from 'src/filters';
+import { dashIfEmpty, parsePhone } from 'src/filters';
 import useOpenURL from 'src/composables/useOpenURL';
 
 const props = defineProps({
@@ -12,50 +12,65 @@ const props = defineProps({
 
 const phone = ref(props.phoneNumber);
 const config = reactive({
-    sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
     'say-simple': {
         icon: 'vn:saysimple',
         url: null,
         channel: props.channel,
     },
+    sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
 });
-const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
+
+const attrs = useAttrs();
+const types = Object.keys(config)
+    .filter((key) => key in attrs)
+    .sort();
+const activeTypes = types.length ? types : ['sip'];
 
 onBeforeMount(async () => {
     if (!phone.value) return;
-    let { channel } = config[type];
 
-    if (type === 'say-simple') {
+    for (const type of activeTypes) {
-        const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
+        if (type === 'say-simple') {
-            .data;
+            let { channel } = config[type];
-        if (!channel) channel = defaultChannel;
+            const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
+                .data;
+            if (!channel) channel = defaultChannel;
 
-        phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
+            phone.value = await parsePhone(
-        config[
+                props.phoneNumber,
-            type
+                props.country?.toLowerCase(),
-        ].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
+            );
+            config[type].url =
+                `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
+        }
     }
 });
 
-function handleClick() {
+function handleClick(type) {
     if (config[type].url) useOpenURL(config[type].url);
     else if (config[type].href) window.location.href = config[type].href;
 }
 </script>
+
 <template>
-    <QBtn
+    <div class="flex items-center gap-2">
-        v-if="phone"
+        <template v-for="type in activeTypes">
-        flat
+            <QBtn
-        round
+                :key="type"
-        :icon="config[type].icon"
+                v-if="phone"
-        size="sm"
+                flat
-        color="primary"
+                round
-        padding="none"
+                :icon="config[type].icon"
-        @click.stop="handleClick"
+                size="sm"
-    >
+                color="primary"
-        <QTooltip>
+                padding="none"
-            {{ capitalize(type).replace('-', '') }}
+                @click.stop="() => handleClick(type)"
-        </QTooltip>
+            >
-    </QBtn>
+                <QTooltip>
-    {{ phoneNumber }}
+                    {{ capitalize(type).replace('-', '') }}
+                </QTooltip>
+            </QBtn></template
+        >
+        <span>{{ dashIfEmpty(phone) }}</span>
+    </div>
 </template>

src/pages/Customer/Card/CustomerSummary.vue

@@ -84,29 +84,31 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv :label="t('customer.summary.customerId')" :value="entity.id" />
                 <VnLv :label="t('globals.name')" :value="entity.name" />
                 <VnLv :label="t('customer.summary.contact')" :value="entity.contact" />
-                <VnLv :value="entity.phone">
+                <VnLv :label="t('customer.extendedList.tableVisibleColumns.phone')">
-                    <template #label>
+                    <template #value>
-                        {{ t('customer.extendedList.tableVisibleColumns.phone') }}
                         <VnLinkPhone :phone-number="entity.phone" />
                     </template>
                 </VnLv>
-                <VnLv :value="entity.mobile">
+                <VnLv :label="t('customer.summary.mobile')">
-                    <template #label>
+                    <template #value>
-                        {{ t('customer.summary.mobile') }}
-                        <VnLinkPhone :phone-number="entity.mobile" />
                         <VnLinkPhone
+                            sip
                             say-simple
                             :phone-number="entity.mobile"
                             :channel="entity.country?.saySimpleCountry?.channel"
-                            class="q-ml-xs"
                         />
                     </template>
                 </VnLv>
-                <VnLv :value="entity.email" copy
+                <VnLv
-                    ><template #label>
+                    :label="t('globals.params.email')"
-                        {{ t('globals.params.email') }}
+                    :value="entity.email"
-                        <VnLinkMail email="entity.email"></VnLinkMail> </template
+                    class="ellipsis"
-                ></VnLv>
+                    copy
+                >
+                    <template #value>
+                        <VnLinkMail :email="entity.email" />
+                    </template>
+                </VnLv>
                 <VnLv :label="t('globals.department')">
                     <template #value>
                         <span class="link" v-text="entity.department?.name" />

src/pages/Route/Roadmap/RoadmapSummary.vue

@@ -112,12 +112,9 @@ const filter = {
                         :label="t('Trailer Plate')"
                         :value="dashIfEmpty(entity?.trailerPlate)"
                     />
-                    <VnLv :label="t('Phone')" :value="dashIfEmpty(entity?.phone)">
+                    <VnLv :label="t('Phone')">
                         <template #value>
-                            <span>
+                            <VnLinkPhone :phone-number="entity?.phone" />
-                                {{ dashIfEmpty(entity?.phone) }}
-                                <VnLinkPhone :phone-number="entity?.phone" />
-                            </span>
                         </template>
                     </VnLv>
                     <VnLv

src/pages/Worker/Card/WorkerDescriptor.vue

@@ -116,7 +116,7 @@ const handlePhotoUpdated = (evt = false) => {
         <template #body="{ entity }">
             <VnLv :label="t('globals.user')" :value="entity.user?.name" />
             <VnLv
-                class="ellipsis-text"
+                class="ellipsis"
                 :label="t('globals.params.email')"
                 :value="entity.user?.emailUser?.email"
                 copy
@@ -128,15 +128,13 @@ const handlePhotoUpdated = (evt = false) => {
                 </template>
             </VnLv>
 
-            <VnLv :value="entity.phone">
+            <VnLv :label="t('globals.phone')">
-                <template #label>
+                <template #value>
-                    {{ t('globals.phone') }}
                     <VnLinkPhone :phone-number="entity.phone" />
                 </template>
             </VnLv>
-            <VnLv :value="entity?.sip?.extension">
+            <VnLv :label="t('worker.summary.sipExtension')">
-                <template #label>
+                <template #value>
-                    {{ t('worker.summary.sipExtension') }}
                     <VnLinkPhone :phone-number="entity?.sip?.extension" />
                 </template>
             </VnLv>

src/pages/Worker/Card/WorkerSummary.vue

@@ -73,21 +73,18 @@ onBeforeMount(async () => {
                                 />
                             </template>
                         </VnLv>
-                        <VnLv :value="worker.mobileExtension">
+                        <VnLv :label="t('worker.summary.phoneExtension')">
-                            <template #label>
+                            <template #value>
-                                {{ t('worker.summary.phoneExtension') }}
                                 <VnLinkPhone :phone-number="worker.mobileExtension" />
                             </template>
                         </VnLv>
-                        <VnLv :value="worker.phone">
+                        <VnLv :label="t('worker.summary.entPhone')">
-                            <template #label>
+                            <template #value>
-                                {{ t('worker.summary.entPhone') }}
                                 <VnLinkPhone :phone-number="worker.phone" />
                             </template>
                         </VnLv>
-                        <VnLv :value="advancedSummary?.client?.phone">
+                        <VnLv :label="t('worker.summary.personalPhone')">
-                            <template #label>
+                            <template #value>
-                                {{ t('worker.summary.personalPhone') }}
                                 <VnLinkPhone
                                     :phone-number="advancedSummary?.client?.phone"
                                 />
@@ -135,6 +132,7 @@ onBeforeMount(async () => {
                 <VnTitle :text="t('worker.summary.userData')" />
                 <VnLv :label="t('globals.name')" :value="worker?.user?.nickname" />
                 <VnLv
+                    class="ellipsis"
                     :label="t('globals.params.email')"
                     :value="worker.user?.emailUser?.email"
                     copy
@@ -147,9 +145,8 @@ onBeforeMount(async () => {
                         </span>
                     </template>
                 </VnLv>
-                <VnLv :value="worker?.sip?.extension">
+                <VnLv :label="t('worker.summary.sipExtension')">
-                    <template #label>
+                    <template #value>
-                        {{ t('worker.summary.sipExtension') }}
                         <VnLinkPhone :phone-number="worker?.sip?.extension" />
                     </template>
                 </VnLv>