fix: search for destination and display name[WTEL-4985/4776]

webitel · Sep 16, 2024 · 6cc39a7 · 6cc39a7
1 parent 0c6173a
commit 6cc39a7
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 64 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "@vuelidate/core": "^2.0.3",
     "@vuelidate/validators": "^2.0.4",
     "@vueuse/core": "^11.0.3",
-    "@webitel/ui-sdk": "^24.10.5",
+    "@webitel/ui-sdk": "^24.10.8",
     "axios": "^1.7.7",
     "deep-equal": "^2.2.1",
     "dompurify": "^3.1.2",

diff --git a/src/modules/contacts/components/__tests__/opened-contact-general.spec.js b/src/modules/contacts/components/__tests__/opened-contact-general.spec.js
@@ -5,7 +5,7 @@ describe('OpenedContactGeneral', () => {
   it('renders a component', () => {
     const wrapper = shallowMount(OpenedContactGeneral, {
       props: {
-        commonName: 'jest',
+        name: 'jest',
       },
       global: {
         provide: {

diff --git a/src/modules/contacts/components/contact-popup.vue b/src/modules/contacts/components/contact-popup.vue
@@ -12,12 +12,12 @@
     <template #main>
       <form class="contact-popup-form">
         <wt-input
-          :value="draft.name.commonName"
+          :value="draft.name"
           :label="t('reusable.name')"
-          :v="v$.draft.name.commonName"
+          :v="v$.draft.name"
           required
           prevent-trim
-          @input="draft.name.commonName = $event"
+          @input="draft.name = $event"
         />
         <wt-select
           :value="draft.timezones[0]?.timezone"
@@ -94,9 +94,7 @@ const store = useStore();
 const userinfo = computed(() => store.state.userinfo);
 
 const generateNewDraft = () => ({
-  name: {
-    commonName: '',
-  },
+  name: '',
   timezones: [],
   managers: [],
   labels: [],
@@ -108,9 +106,7 @@ const draft = ref(generateNewDraft());
 
 const v$ = useVuelidate(computed(() => ({
   draft: {
-    name: {
-      commonName: { required },
-    },
+    name: { required },
   },
 })), { draft }, { $autoDirty: true });
 

diff --git a/src/modules/contacts/components/opened-contact-general.vue b/src/modules/contacts/components/opened-contact-general.vue
@@ -29,11 +29,11 @@
 
     <wt-avatar
       size="3xl"
-      :username="commonName"
+      :username="name"
     />
 
     <p class="opened-contact-general-name">
-      {{ commonName }}
+      {{ name }}
     </p>
 
     <wt-divider />
@@ -103,9 +103,9 @@ import { useI18n } from 'vue-i18n';
 const access = inject('access');
 
 const props = defineProps({
-  commonName: {
+  name: {
     type: String,
-    required: true,
+    default: ''
   },
   timezones: {
     type: Array,

diff --git a/src/modules/contacts/components/opened-contact.vue b/src/modules/contacts/components/opened-contact.vue
@@ -32,7 +32,7 @@
         />
         <div class="opened-contact-content">
           <opened-contact-general
-            :common-name="itemInstance.name ? itemInstance.name.commonName : ''"
+            :name="itemInstance.name"
             :timezones="itemInstance.timezones ? itemInstance.timezones : []"
             :managers="itemInstance.managers ? itemInstance.managers : []"
             :about="itemInstance.about"
@@ -108,7 +108,7 @@ const path = computed(() => {
     { name: t('crm') },
     { name: t('contacts.contact', 2), route: baseUrl },
     {
-      name: itemInstance.value?.name?.commonName || 'Contact',
+      name: itemInstance.value?.name || 'Contact',
       route: `/contacts/${id.value}`,
     },
   ];

diff --git a/src/modules/contacts/store/contacts.js b/src/modules/contacts/store/contacts.js
@@ -18,9 +18,7 @@ import variables from '../modules/variables/store/variables';
 
 const cardState = {
   itemInstance: {
-    name: {
-      commonName: '',
-    },
+    name: '',
     timezones: [],
     managers: [],
     labels: [],