From 9cf1a4375700a0d473db1affcba5e9d28f22d124 Mon Sep 17 00:00:00 2001
From: madelinegr <mgriswold99@gmail.com>
Date: Thu, 6 Jun 2019 12:57:38 -0400
Subject: Guid emptystring error fixed for grouping

---
 .../views/collections/CollectionBaseView.tsx       |  3 ++
 .../views/presentationview/PresentationElement.tsx | 53 +++++++++++++++++-----
 2 files changed, 44 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/client/views/collections/CollectionBaseView.tsx b/src/client/views/collections/CollectionBaseView.tsx
index 734669893..6639879e1 100644
--- a/src/client/views/collections/CollectionBaseView.tsx
+++ b/src/client/views/collections/CollectionBaseView.tsx
@@ -146,6 +146,9 @@ export class CollectionBaseView extends React.Component<CollectionViewProps> {
             }
         });
 
+        //initial
+        //
+
         if (index !== -1) {
             value.splice(index, 1);
 
diff --git a/src/client/views/presentationview/PresentationElement.tsx b/src/client/views/presentationview/PresentationElement.tsx
index 81be2c49f..2d14476d2 100644
--- a/src/client/views/presentationview/PresentationElement.tsx
+++ b/src/client/views/presentationview/PresentationElement.tsx
@@ -40,33 +40,60 @@ export default class PresentationElement extends React.Component<PresentationEle
     @action
     onGroupClick = (document: Doc, index: number, buttonStatus: boolean) => {
         let p = this.props;
-        if (buttonStatus) {
-            if (index >= 1) {
+        if (index >= 1) {
+            if (buttonStatus) {
                 let newGuid = Utils.GenerateGuid();
-                let aboveGuid = StrCast(p.allListElements[index - 1].presentId, undefined);
-                let docGuid = StrCast(document.presentId, undefined);
+                let aboveGuid = StrCast(p.allListElements[index - 1].presentId, null);
+                let docGuid = StrCast(document.presentId, null);
                 if (aboveGuid !== undefined) {
                     if (p.groupMappings.has(aboveGuid)) {
                         let aboveArray = p.groupMappings.get(aboveGuid)!;
                         if (p.groupMappings.has(docGuid)) {
+                            console.log("Doc Guid: ", docGuid);
+                            console.log("Above Guid: ", aboveGuid);
                             let docsArray = p.groupMappings.get(docGuid)!;
                             docsArray.forEach((doc: Doc) => {
                                 if (!aboveArray.includes(doc)) {
                                     aboveArray.push(doc);
+
                                 }
                             });
+                            console.log("CAlled first one");
+
                         } else {
                             if (!aboveArray.includes(document)) {
                                 aboveArray.push(document);
+                                console.log("CAlled this one");
+                                console.log("Doc: ", document);
 
                             }
 
                         }
+                        console.log("AboveArray Size: ", aboveArray.length);
+                    } else {
+                        let newAboveArray: Doc[] = [];
+                        newAboveArray.push(p.allListElements[index - 1]);
+                        if (p.groupMappings.has(docGuid)) {
+                            let docsArray = p.groupMappings.get(docGuid)!;
+                            docsArray.forEach((doc: Doc) => {
+                                newAboveArray.push(doc);
+
+                            });
+                        } else {
+                            newAboveArray.push(document);
+
+                        }
+                        p.groupMappings.set(aboveGuid, newAboveArray);
+                        console.log("NewABove array size: ", newAboveArray.length);
+
+
+
                     }
                     document.presentId = aboveGuid;
                 } else {
                     p.allListElements[index - 1].presentId = newGuid;
                     let newAboveArray: Doc[] = [];
+                    newAboveArray.push(p.allListElements[index - 1]);
                     if (p.groupMappings.has(docGuid)) {
                         let docsArray = p.groupMappings.get(docGuid)!;
                         docsArray.forEach((doc: Doc) => newAboveArray.push(doc));
@@ -75,20 +102,22 @@ export default class PresentationElement extends React.Component<PresentationEle
                     }
                     document.presentId = newGuid;
                     p.groupMappings.set(newGuid, newAboveArray);
+                    console.log("New Array created");
 
 
                 }
 
-            }
-        } else {
-            let curArray = p.groupMappings.get(StrCast(document.presentId, Utils.GenerateGuid()))!;
-            let targetIndex = curArray.indexOf(document);
-            let firstPart = curArray.slice(0, targetIndex);
-            let secondPart = curArray.slice(targetIndex);
-            p.groupMappings.set(StrCast(p.allListElements[index - 1].presentId, Utils.GenerateGuid()), firstPart);
-            p.groupMappings.set(StrCast(document.presentId, Utils.GenerateGuid()), secondPart);
+            } else {
+                let curArray = p.groupMappings.get(StrCast(document.presentId, Utils.GenerateGuid()))!;
+                let targetIndex = curArray.indexOf(document);
+                let firstPart = curArray.slice(0, targetIndex);
+                let secondPart = curArray.slice(targetIndex);
+                p.groupMappings.set(StrCast(p.allListElements[index - 1].presentId, Utils.GenerateGuid()), firstPart);
+                p.groupMappings.set(StrCast(document.presentId, Utils.GenerateGuid()), secondPart);
 
 
+            }
+
         }
 
     }
-- 
cgit v1.2.3-70-g09d2