From e09e707ec9e88dbc769ab7860223d92f3ec16068 Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Wed, 14 Dec 2022 18:47:14 +0300
Subject: [PATCH] =?UTF-8?q?WIP=20=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=B0=20=D0=BF=D1=80=D0=B8?=
 =?UTF-8?q?=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/clients/components/ClientsTable.vue | 12 ++++--
 .../clients/components/ClientsTableRow.vue    | 40 ++++++++++++-------
 .../components/cells/TableCellBodyName.vue    |  5 +--
 3 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue
index e352a98..4dc7774 100644
--- a/src/pages/clients/components/ClientsTable.vue
+++ b/src/pages/clients/components/ClientsTable.vue
@@ -122,12 +122,18 @@ export default {
   },
   methods: {
     updateDataClient() {
-      this.clearCreatedClientName();
       if (this.textSearch) this.filteredClientsCount -= 1;
       else this.clientsCount -= 1;
       if (this.dataClients.find(({ id }) => id === this.deletedRowId)) {
-        if (this.dataClients.length === 1) this.currentTablePage -= 1;
-        else this.fetchDataClients();
+        if (this.createdClientName) {
+          this.clearingTextSearch = true;
+          this.currentTablePage === 1
+            ? this.fetchDataClients()
+            : (this.currentTablePage = 1);
+        } else {
+          if (this.dataClients.length === 1) this.currentTablePage -= 1;
+          else this.fetchDataClients();
+        }
       }
     },
     saveDataClients(data) {
diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue
index 391a9ee..7f372c1 100644
--- a/src/pages/clients/components/ClientsTableRow.vue
+++ b/src/pages/clients/components/ClientsTableRow.vue
@@ -11,13 +11,13 @@
         @click="(e) => openDetailInfo(e)",
         :class="{'row-overlay-color': rowOverlay}"
       )
-        .flex.items-center.px-2(
-          v-show="!isOpenChange",
-          :tabindex="1",
-          @click="(e) => openPopup(e)",
-          @blur="handleUnFocusPopup"
-        )
-          .relative.dots-button.icon-dots.cursor-pointer.leading-6.text-center
+        .dots-wrapper.flex.items-center.px-2
+          .relative.dots-button.icon-dots.cursor-pointer.leading-6.text-center(
+            v-show="!isOpenChange && !rowOverlay",
+            :tabindex="1",
+            @click="(e) => openPopup(e)",
+            @blur="handleUnFocusPopup"
+          )
             clients-action-popup(
               v-if="isOpenPopup",
               :open-change-data="openChangeData",
@@ -25,8 +25,9 @@
               @delete-client="transmitDeleteClient",
               :create-medical-card="createMedicalCard"
             )
-        .dots.flex.justify-center.items-center(v-if="!rowOverlay")
-          .flex.z-10(v-if="isOpenChange", class="pl-[10px]")
+          .flex.z-10(
+            v-if="isOpenChange && !rowOverlay",
+          )
             base-button(
               @click="closeChangeData",
               confirm,
@@ -209,7 +210,7 @@ export default {
       this.timer = null;
     },
     startTimer() {
-      this.countdown = 600;
+      this.countdown = 30;
       this.timer = setInterval(() => {
         this.changeCountdown();
       }, 1000);
@@ -339,7 +340,10 @@ export default {
           username: contact.username,
           person_id: this.client.id,
         })
-        .then(() => this.fetchDataClients());
+        .then(() => {
+          if (this.createdClientName) this.fetchCreatedClientData;
+          else this.fetchDataClients();
+        });
     },
     postUpdateContact(contact) {
       fetchWrapper
@@ -348,12 +352,16 @@ export default {
           username: contact.username,
           person_id: this.client.id,
         })
-        .then(() => this.fetchDataClients());
+        .then(() => {
+          if (this.createdClientName) this.fetchCreatedClientData;
+          else this.fetchDataClients();
+        });
     },
     postDeleteContact(contact) {
-      fetchWrapper
-        .del(`general/contact/${contact.id}/delete/`)
-        .then(() => this.fetchDataClients());
+      fetchWrapper.del(`general/contact/${contact.id}/delete/`).then(() => {
+        if (this.createdClientName) this.fetchCreatedClientData;
+        else this.fetchDataClients();
+      });
     },
     addNetwork(network) {
       this.dataClient.contacts.push(network);
@@ -703,4 +711,6 @@ export default {
   overflow: hidden
 .closed-detail .detail
   max-height: 0
+.dots-wrapper
+  width: 36px
 </style>
diff --git a/src/pages/clients/components/cells/TableCellBodyName.vue b/src/pages/clients/components/cells/TableCellBodyName.vue
index a5935b8..b9cbd46 100644
--- a/src/pages/clients/components/cells/TableCellBodyName.vue
+++ b/src/pages/clients/components/cells/TableCellBodyName.vue
@@ -1,7 +1,6 @@
 <template lang="pug">
-  .flex.box-border.px-4.items-center.gap-x-3.w-full.text-sm(
+  .flex.box-border.px-8.pr-4.items-center.gap-x-3.w-full.text-sm(
     :style="{ minWidth : width + 'px', maxWidth : width + 'px' }",
-    :class="{'open-change': isOpenChange}"
   )
     base-avatar(:size="36", :color="avatarColor", v-if="!photo") {{avatar}}
     base-avatar(:size="36", v-else)
@@ -42,6 +41,4 @@ export default {
   border-radius: 50%
   background-color: var(--font-grey-color)
   color: var(--font-dark-blue-color)
-.open-change
-  padding-left: 36px
 </style>