From d343589d16dfc28c802d59c13d883656bc7ba375 Mon Sep 17 00:00:00 2001
From: Kasen IO <kasenvr@gmail.com>
Date: Fri, 24 Apr 2020 03:16:31 -0400
Subject: [PATCH] Folder recursion safeguards established.

---
 scripts/system/inventory/src/App.vue          | 44 ++++++++++++++-----
 .../inventory/src/components/ItemIterator.vue |  2 +-
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/scripts/system/inventory/src/App.vue b/scripts/system/inventory/src/App.vue
index 05575a3c62..df2ac57639 100644
--- a/scripts/system/inventory/src/App.vue
+++ b/scripts/system/inventory/src/App.vue
@@ -1104,6 +1104,9 @@ export default {
             }
         },
         getFolderList: function(request) {
+            var generateList;
+            this.recursiveFolderHoldingList = []; // Clear that list before we do anything.
+            
             if (request == "edit") {
                 this.folderList = [
                     {
@@ -1115,6 +1118,9 @@ export default {
                         "uuid": "No Folder"
                     },
                 ];
+                
+                generateList = this.recursiveFolderPopulate(this.items, true, null);
+                
             } else if (request == "add") {
                 this.folderList = [
                     {
@@ -1122,10 +1128,24 @@ export default {
                         "uuid": "No Folder"
                     },
                 ];
+                
+                generateList = this.recursiveFolderPopulate(this.items, true, null);
+                
+            } else if (request == "editFolder") {
+                this.folderList = [
+                    {
+                        "name": "No Change",
+                        "uuid": "No Change"
+                    },
+                    {
+                        "name": "No Folder", 
+                        "uuid": "No Folder"
+                    },
+                ];
+                
+                generateList = this.recursiveFolderPopulate(this.items, true, this.$store.state.editFolderDialog.data.uuid);
             }
             
-            var generateList = this.recursiveFolderPopulate(this.items, true);
-            
             if (generateList) {
                 var combinedArray = this.folderList.concat(generateList);
                 this.folderList = combinedArray;
@@ -1236,15 +1256,19 @@ export default {
             
             return null;
         },
-        recursiveFolderPopulate: function(indexToSearch, firstIteration) {
+        recursiveFolderPopulate: function(indexToSearch, firstIteration, avoidFolder) {
+            console.info(JSON.stringify(this.folderList));
             for (var i = 0; i < indexToSearch.length; i++) {
                 if (Object.prototype.hasOwnProperty.call(indexToSearch[i], "items") && indexToSearch[i].items.length > 0) {
-                    this.recursiveFolderHoldingList.push({
-                        "name": indexToSearch[i].name,
-                        "uuid": indexToSearch[i].uuid,
-                    });
-                    
-                    this.recursiveFolderPopulate(indexToSearch[i].items, false);
+                    // We want to avoid adding the folder itself and also any child folders it may have, putting a folder within its child folder will nuke it.
+                    if (avoidFolder !== indexToSearch[i].uuid) {
+                        this.recursiveFolderHoldingList.push({
+                            "name": indexToSearch[i].name,
+                            "uuid": indexToSearch[i].uuid,
+                        });
+                        
+                        this.recursiveFolderPopulate(indexToSearch[i].items, false, avoidFolder);
+                    }
                 }
             }
             
@@ -1421,7 +1445,7 @@ export default {
         editFolderDialogShow: {
             handler: function(newVal) {
                 if (newVal === true) {
-                    this.getFolderList('edit');
+                    this.getFolderList('editFolder');
                 }
             }
         }
diff --git a/scripts/system/inventory/src/components/ItemIterator.vue b/scripts/system/inventory/src/components/ItemIterator.vue
index a19e4b1814..9e3278fc1b 100644
--- a/scripts/system/inventory/src/components/ItemIterator.vue
+++ b/scripts/system/inventory/src/components/ItemIterator.vue
@@ -132,9 +132,9 @@
                 <div class="text-center my-2">
                     <v-btn medium tile color="purple" class="mx-1 folder-button"
                         @click="
-                            editFolderDialogStore.show = true; 
                             editFolderDialogStore.data.uuid = item.uuid;
                             editFolderDialogStore.data.name = item.name;
+                            editFolderDialogStore.show = true; 
                         "
                     >
                         <v-icon>mdi-pencil</v-icon>