Merge branch '15-fixed-contacts' into 'master'

Контакты: фикс запросов, фикс списка соцсетей

Closes #15

See merge request astra/astra-frontend!505

src/pages/newMedicalCard/components/BasicDataForms/ContactsForm.vue

@@ -20,12 +20,12 @@
                 @click="() => copyLinkNetwork(data.value)"
                 style="background-color: var(--bg-light-grey)"
               )
-                q-icon.icon(:name="mapNetworks[data.kind].icon" :class="{old: data.id, new: data.filled}")
-                span.text-sm.font-medium {{ mapNetworks[data.kind].title || data.value }}
+                q-icon.icon(:name="mapNetworks[data.category].icon" :class="{old: data.id, new: data.filled}")
+                span.text-sm.font-medium {{ mapNetworks[data.category].title || data.value }}
               .flex.gap-10px(v-else v-click-outside="() => checkNetworksField(index)" :key="key+index")
                 base-select-networks(
                   :list-data="Object.values(mapNetworks)"
-                  :option-data="data.kind"
+                  :option-data="data.category"
                   :choose-option="(e) => chooseNetwork(e, index)"
                   :style-border="true"
                   :size-input="50"
@@ -112,7 +112,7 @@ export default {
       delContacts: "deleteContact",
     }),
     checkNetworksField(index) {
-      if (this.contacts.networks[index].kind)
+      if (this.contacts.networks[index].category)
         this.contacts.networks[index].filled = true;
     },
     openEdit() {
@@ -130,7 +130,7 @@ export default {
         ...this.contacts.emails,
         ...this.contacts.networks,
       ];
-      const notEmptyContacts = allNewContacts.filter((el) => !el.id);
+      const notEmptyContacts = allNewContacts.filter((el) => el.category);
       return this.changeContacts(this.initAllContacts, notEmptyContacts);
     },
     changeContacts(initData, notEmptyContacts) {
@@ -139,7 +139,7 @@ export default {
         .map((el) => this.delContacts({ id: el.id }));
       const requests = notEmptyContacts.map((el) => {
         const requestObj = {
-          category: el.category || el.kind,
+          category: el.category,
           value: el.value,
         };
         delete requestObj.id;
@@ -184,18 +184,18 @@ export default {
       );
     },
     chooseNetwork(e, index) {
-      this.contacts.networks[index].kind = e.currentTarget.id;
+      this.contacts.networks[index].category = e.currentTarget.id;
     },
     addNewContact(e, key) {
       if (e.pointerType) {
         if (key === "networks") {
           this.contacts[key].push({
             filled: false,
-            kind: this.configData[key]?.kind,
+            category: this.configData[key]?.category,
           });
         } else {
           this.contacts[key].push({
-            kind: this.configData[key]?.kind,
+            category: this.configData[key]?.category,
           });
         }
       }

src/pages/newMedicalCard/components/ConfidantForms/ConfidantForm.vue

@@ -22,8 +22,8 @@
                 @click="() => copyLinkNetwork(network.username)"
                 style="background-color: var(--bg-light-grey)"
               )
-                q-icon.icon(:name="mapNetworks[network.kind].icon" :class="{old: network.id, new: !network.id}")
-                span.text-smm.font-medium {{ mapNetworks[network.kind].title || network.username }}
+                q-icon.icon(:name="mapNetworks[network.category].icon" :class="{old: network.id, new: !network.id}")
+                span.text-smm.font-medium {{ mapNetworks[network.category].title || network.username }}
               .flex.relative
                 q-btn(
                   v-if="isEdit"
@@ -129,7 +129,7 @@ export default {
   data() {
     return {
       newNetwork: {
-        kind: mapNetworks["TELEGRAM"],
+        category: mapNetworks["TELEGRAM"],
         username: "",
       },
       isEdit: false,
@@ -169,13 +169,13 @@ export default {
     saveNetwork() {
       if (this.newNetwork.username) {
         this.confidants[this.index].networks.push({
-          kind: this.newNetwork.kind.id,
+          category: this.newNetwork.category.id,
           username: this.newNetwork.username,
         });
         this.isOpenPopupAdding = false;
         this.isCheckChange = true;
         this.newNetwork = {
-          kind: mapNetworks["TELEGRAM"],
+          category: mapNetworks["TELEGRAM"],
           username: "",
         };
       } else {

src/pages/newMedicalCard/utils/medicalConfig.js

@@ -152,32 +152,32 @@ export const mapNetworks = {
   VK: {
     id: "VK",
     title: "VK",
-    icon: "app:icon-vk",
+    icon: "app:vk",
     network: "VK",
   },
   TELEGRAM: {
     id: "TELEGRAM",
     title: "Telegram",
-    icon: "app:icon-tg",
+    icon: "app:tg",
     network: "TELEGRAM",
   },
   GMAIL: {
     id: "GMAIL",
     title: "Gmail",
-    icon: "app:icon-google",
+    icon: "app:google",
     network: "GMAIL",
   },
   SLACK: {
     id: "SLACK",
     title: "Slack",
-    icon: "app:icon-slack",
+    icon: "app:slack",
     network: "SLACK",
     markerLink: "slack",
   },
   DISCORD: {
     id: "DISCORD",
     title: "Discord",
-    icon: "app:icon-discord",
+    icon: "app:discord",
     network: "DISCORD",
   },
   VIBER: {
@@ -200,7 +200,7 @@ export const contactsDataForm = {
     fieldName: "Телефон",
     error:
       "Не корректно введен номер телефона. Номер телефона должен состоять из 10 цифр (без учета +7)",
-    kind: "PHONE",
+    category: "PHONE",
     rules: [(val) => ruleLengthValue(val, 18)],
     inputMask: "+7 (###) ###-##-##",
   },
@@ -210,14 +210,14 @@ export const contactsDataForm = {
     error:
       "Не корректно введен адрес почты. Почта должна содержать локальное имя, знак @ и имя домена",
     rules: [(val) => ruleEmailValue(val)],
-    kind: "EMAIL",
+    category: "EMAIL",
   },
   networks: {
     title: "Социальные сети",
     fieldName: "Соцсеть",
     error: "Отсутсвует ссылка соцсети",
     rules: [(val) => ruleNotValue(val)],
-    kind: "TELEGRAM",
+    category: "TELEGRAM",
   },
 };