Merge pull request #2011 from zacpwhite/bugifx/2000

#2000 - Recursive page search
PiranhaCMS · Sep 20, 2023 · 3a456b3 · 3a456b3
2 parents 62d0670 + e9554df
commit 3a456b3
Show file tree

Hide file tree

Showing 8 changed files with 2,170 additions and 2,475 deletions.
diff --git a/core/Piranha.Manager/assets/dist/js/piranha-deps-dev.js b/core/Piranha.Manager/assets/dist/js/piranha-deps-dev.js
diff --git a/core/Piranha.Manager/assets/dist/js/piranha-deps-dev.min.js b/core/Piranha.Manager/assets/dist/js/piranha-deps-dev.min.js
diff --git a/core/Piranha.Manager/assets/dist/js/piranha-deps.js b/core/Piranha.Manager/assets/dist/js/piranha-deps.js
diff --git a/core/Piranha.Manager/assets/dist/js/piranha-deps.min.js b/core/Piranha.Manager/assets/dist/js/piranha-deps.min.js
diff --git a/core/Piranha.Manager/assets/dist/js/piranha.components.js b/core/Piranha.Manager/assets/dist/js/piranha.components.js
diff --git a/core/Piranha.Manager/assets/dist/js/piranha.js b/core/Piranha.Manager/assets/dist/js/piranha.js
@@ -932,14 +932,33 @@ piranha.pagepicker = new Vue({
     },
     computed: {
         filteredItems: function () {
-            var self = this;
-
-            return this.items.filter(function (item) {
-                if (self.search.length > 0) {
-                    return item.title.toLowerCase().indexOf(self.search.toLowerCase()) > -1
-                }
-                return true;
-            });
+            let self = this;
+
+            if (self.search && self.search.length < 1) {
+                return this.items;   
+            }
+
+            let items = Object.assign([], this.items);
+            let searchTerm = self.search ? self.search.toLowerCase() : "";
+
+            let filterRecursive = function(arr) {
+                return arr.reduce(function(acc, item){
+                    let newItem = Object.assign({}, item);
+
+                    if (newItem.items) {
+                        newItem.items = filterRecursive(item.items);
+                        newItem.isExpanded = newItem.items.length > 0;
+                    }
+
+                    if (newItem.title && (newItem.title.toLowerCase().indexOf(searchTerm) > -1 || newItem.isExpanded)) {
+                        acc.push(newItem);
+                    }
+
+                    return acc;
+                }, []);
+            };
+
+            return filterRecursive(items);
         }
     },
     methods: {

diff --git a/core/Piranha.Manager/assets/dist/js/piranha.min.js b/core/Piranha.Manager/assets/dist/js/piranha.min.js
diff --git a/core/Piranha.Manager/assets/src/js/piranha.pagepicker.js b/core/Piranha.Manager/assets/src/js/piranha.pagepicker.js
@@ -15,14 +15,33 @@ piranha.pagepicker = new Vue({
     },
     computed: {
         filteredItems: function () {
-            var self = this;
-
-            return this.items.filter(function (item) {
-                if (self.search.length > 0) {
-                    return item.title.toLowerCase().indexOf(self.search.toLowerCase()) > -1
-                }
-                return true;
-            });
+            let self = this;
+
+            if (self.search && self.search.length < 1) {
+                return this.items;   
+            }
+
+            let items = Object.assign([], this.items);
+            let searchTerm = self.search ? self.search.toLowerCase() : "";
+
+            let filterRecursive = function(arr) {
+                return arr.reduce(function(acc, item){
+                    let newItem = Object.assign({}, item);
+
+                    if (newItem.items) {
+                        newItem.items = filterRecursive(item.items);
+                        newItem.isExpanded = newItem.items.length > 0;
+                    }
+
+                    if (newItem.title && (newItem.title.toLowerCase().indexOf(searchTerm) > -1 || newItem.isExpanded)) {
+                        acc.push(newItem);
+                    }
+
+                    return acc;
+                }, []);
+            };
+
+            return filterRecursive(items);
         }
     },
     methods: {