From f31c895b8dd9c89b73a49f04c969e67c3372b194 Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Wed, 27 Jul 2022 14:28:11 +0300
Subject: [PATCH] fixed a bug when deleting elements

---
 src/pages/digitalId/ProfileId.jsx     | 23 ++++++++++++++++++++---
 src/partials/profile/ProfileTable.jsx | 20 +++-----------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/pages/digitalId/ProfileId.jsx b/src/pages/digitalId/ProfileId.jsx
index 6acb0b0..6528d6d 100644
--- a/src/pages/digitalId/ProfileId.jsx
+++ b/src/pages/digitalId/ProfileId.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { registrationStore } from "../../store/store";
 import Sidebar from '../../partials/Sidebar';
 import { observer } from 'mobx-react-lite';
@@ -26,6 +26,20 @@ const Profile = observer (() => {
   const [propertyValues, setPropertyValues] = useState([]);
   const [updatedValues, setUpdatedValues] = useState([defaultValues]);
   const [addedValues, setAddedValues] = useState(defaultValues);
+  const [isCheck, setIsCheck] = useState([]);
+
+  useEffect(() => {
+    handleSelectedItems(isCheck);
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isCheck]);
+
+  const handleClick = e => {
+    const { id, checked } = e.target;
+    setIsCheck([...isCheck, id]);
+    if (!checked || !id) {
+      setIsCheck(isCheck.filter(item => item !== id));
+    }
+  };
 
   const openHint = () => {
     if (!addedValues.label) {
@@ -106,6 +120,7 @@ const Profile = observer (() => {
     setUpdatePanelOpen(false);
     changeDataParameters();
     setChangePanelOpen(true);
+    setIsCheck([]);
   };
 
   const deleteDataParameters = () => {
@@ -157,6 +172,7 @@ const Profile = observer (() => {
       }: elem)));
     setUpdatePanelOpen(false);
     setChangePanelOpen(true);
+    setIsCheck([]);
   };
 
   const openRemovePanel = () => {
@@ -172,7 +188,8 @@ const Profile = observer (() => {
   const applyDataDeletion = () => {
     setRemovePanelOpen(false);
     setButtonPanelOpen(true);
-    deleteDataParameters()
+    deleteDataParameters();
+    setIsCheck([]);
   };
 
   const handleInput = (text, field) => {
@@ -217,7 +234,7 @@ const Profile = observer (() => {
                   </ul>
                 </div>
                 {/* Table */}
-                <ProfileTable selectedItems={handleSelectedItems} userData={registrationStore.decryptedUserData}/>
+                <ProfileTable isCheck={isCheck} handleClick={handleClick} userData={registrationStore.decryptedUserData}/>
               </div>
               {/* Left sidebar */}
               <div>
diff --git a/src/partials/profile/ProfileTable.jsx b/src/partials/profile/ProfileTable.jsx
index 283079f..7771ce1 100644
--- a/src/partials/profile/ProfileTable.jsx
+++ b/src/partials/profile/ProfileTable.jsx
@@ -3,12 +3,11 @@ import ProfileTableItem from './ProfileTableItem';
 import ProfileIcon from '../../images/profile-icon.svg';
 
 function ProfileTable({
-  selectedItems,
-  userData
+  userData,
+  handleClick,
+  isCheck,
 }) {
 
-  const [isCheck, setIsCheck] = useState([]);
-
   const defaultData = {
     image: ProfileIcon,
     status: 'Stored',
@@ -16,19 +15,6 @@ function ProfileTable({
     avatars: null
   };
 
-  useEffect(() => {
-    selectedItems(isCheck);
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isCheck]);
-
-  const handleClick = e => {
-    const { id, checked } = e.target;
-    setIsCheck([...isCheck, id]);
-    if (!checked) {
-      setIsCheck(isCheck.filter(item => item !== id));
-    }
-  };
-
   const data = {
     general:["First name","Second name", "Gender", "Birthdate", "Place of birth"],
     nationality:["Nationality", "National ID", "National doctype", "National doc ID", "National doc issue date", "National doc expiry date"],