From 876c5f51c2caabf92b47d5a18a9b98e601806bf4 Mon Sep 17 00:00:00 2001
From: Vladyslav Matsiiako <matsiiako@gmail.com>
Date: Tue, 27 Dec 2022 16:46:15 -0500
Subject: [PATCH] Fixed the bugs with secret overrides and the sidebar

---
 frontend/components/basic/Toggle.tsx      |  1 -
 frontend/components/dashboard/SideBar.tsx | 24 +++++++++++------------
 frontend/pages/dashboard/[id].tsx         | 11 ++++++++++-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/frontend/components/basic/Toggle.tsx b/frontend/components/basic/Toggle.tsx
index 70e32426e..d15aed622 100644
--- a/frontend/components/basic/Toggle.tsx
+++ b/frontend/components/basic/Toggle.tsx
@@ -64,7 +64,6 @@ export default function Toggle ({
             id
           ])
         } else {
-          setSharedToHide(sharedToHide!.filter(tempId => tempId != id))
           deleteOverride(id);
         }
         setEnabled(!enabled);
diff --git a/frontend/components/dashboard/SideBar.tsx b/frontend/components/dashboard/SideBar.tsx
index 03499b4d9..6298dd4af 100644
--- a/frontend/components/dashboard/SideBar.tsx
+++ b/frontend/components/dashboard/SideBar.tsx
@@ -83,8 +83,8 @@ const SideBar = ({
         <DashboardInputField
           onChangeHandler={modifyKey}
           type="varName"
-          position={data[0].pos}
-          value={data[0].key}
+          position={data[0]?.pos}
+          value={data[0]?.key}
           isDuplicate={false}
           blurred={false}
         />
@@ -116,11 +116,11 @@ const SideBar = ({
             enabled={overrideEnabled} 
             setEnabled={setOverrideEnabled} 
             addOverride={addOverride} 
-            keyName={data[0].key}
-            value={data[0].value}
-            pos={data[0].pos}
-            id={data[0].id}
-            comment={data[0].comment}
+            keyName={data[0]?.key}
+            value={data[0]?.value}
+            pos={data[0]?.pos}
+            id={data[0]?.id}
+            comment={data[0]?.comment}
             deleteOverride={deleteOverride}
             sharedToHide={sharedToHide}
             setSharedToHide={setSharedToHide}
@@ -130,13 +130,13 @@ const SideBar = ({
           <DashboardInputField
             onChangeHandler={modifyValue}
             type="value"
-            position={overrideEnabled ? data.filter(secret => secret.type == "personal")[0].pos : data[0].pos}
-            value={overrideEnabled ? data.filter(secret => secret.type == "personal")[0].value : data[0].value}
+            position={overrideEnabled ? data.filter(secret => secret.type == "personal")[0]?.pos : data[0]?.pos}
+            value={overrideEnabled ? data.filter(secret => secret.type == "personal")[0]?.value : data[0]?.value}
             isDuplicate={false}
             blurred={true}
           />
           <div className='absolute right-[0.57rem] top-[0.3rem] z-50'>
-            <GenerateSecretMenu modifyValue={modifyValue} position={overrideEnabled ? data.filter(secret => secret.type == "personal")[0].pos : data[0].pos} />
+            <GenerateSecretMenu modifyValue={modifyValue} position={overrideEnabled ? data.filter(secret => secret.type == "personal")[0]?.pos : data[0]?.pos} />
           </div>
         </div>
       </div>
@@ -149,8 +149,8 @@ const SideBar = ({
           isFull={true}
         />
       </div> */}
-      <SecretVersionList secretId={data[0].id} />
-      <CommentField comment={data.filter(secret => secret.type == "shared")[0]?.comment} modifyComment={modifyComment} position={data[0].pos} />
+      <SecretVersionList secretId={data[0]?.id} />
+      <CommentField comment={data.filter(secret => secret.type == "shared")[0]?.comment} modifyComment={modifyComment} position={data[0]?.pos} />
     </div>
     <div className={`flex justify-start max-w-sm mt-4 px-4 mt-full mb-[4.7rem]`}>
       <Button
diff --git a/frontend/pages/dashboard/[id].tsx b/frontend/pages/dashboard/[id].tsx
index ca681d4cc..b79580927 100644
--- a/frontend/pages/dashboard/[id].tsx
+++ b/frontend/pages/dashboard/[id].tsx
@@ -249,6 +249,15 @@ export default function Dashboard() {
    */
   const deleteOverride = (id: string) => {
     setButtonReady(true);
+
+    // find which shared secret corresponds to the overriden version
+    const sharedVersionOfOverride = data!.filter(secret => secret.type == "shared" && secret.key == data!.filter(row => row.id == id)[0]?.key)[0]?.id;
+    
+    // change the sidebar to this shared secret; and unhide it
+    toggleSidebar(sharedVersionOfOverride)
+    setSharedToHide(sharedToHide!.filter(tempId => tempId != sharedVersionOfOverride))
+
+    // resort secrets
     const tempData = data!.filter((row: SecretDataProps) => !(row.id == id && row.type == 'personal'))
     sortValuesHandler(tempData, sortMethod == "alhpabetical" ? "-alphabetical" : "alphabetical")
   };
@@ -419,7 +428,7 @@ export default function Dashboard() {
       <div className="flex flex-row">
         {sidebarSecretId != "None" && <SideBar 
           toggleSidebar={toggleSidebar} 
-          data={data.filter((row: SecretDataProps) => row.id == sidebarSecretId)} 
+          data={data.filter((row: SecretDataProps) => row.key == data.filter(row => row.id == sidebarSecretId)[0]?.key)} 
           modifyKey={listenChangeKey} 
           modifyValue={listenChangeValue} 
           modifyComment={listenChangeComment}