Merge pull request #33 from soderlind/fix/search

Bump version to 1.7.3 and update changelog for improved search functi…

Author: soderlind

.github/workflows/manual-deploy-release.yml

@@ -0,0 +1,28 @@
+name: Manual Deploy Release to WordPress.org
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag to deploy'
+        required: true
+        type: string
+        default: '' 
+jobs:
+  tag:
+    name: New tag
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Subversion
+        run: sudo apt-get update && sudo apt-get install -y subversion
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.tag }}
+
+      - name: WordPress Plugin Deploy
+        uses: 10up/action-wordpress-plugin-deploy@stable
+        env:
+          SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+          SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
+          SLUG: super-admin-all-sites-menu

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+### 1.7.3
+
+- Fixed search functionality:
+  - Improved search performance with better indexing
+  - Added mutation observer to handle dynamically loaded sites
+  - Fixed event handling for search input
+  - Added improved error handling for search elements
+  - Better handling of empty search inputs
+
 ### 1.7.2
 
 - Bump version to trigger a deploy to WordPress.org

build/index.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-api-fetch', 'wp-i18n'), 'version' => '598e59804b1aee3f1164');
+<?php return array('dependencies' => array('wp-api-fetch', 'wp-i18n'), 'version' => '6df7975b628e4eda2261');

build/index.js

@@ -1,7 +1,7 @@
 {
   "name": "soderlind/super-admin-all-sites-menu",
   "description": "For the super admin, replace WP Admin Bar My Sites menu with an All Sites menu.",
-  "version": "1.7.1",
+  "version": "1.7.3",
   "keywords": [
     "wordpress",
     "multisite",

composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "super-admin-all-sites-menu",
-	"version": "1.7.2",
+	"version": "1.7.3",
 	"description": "For the super admin, replace WP Admin Bar My Sites menu with an All Sites menu.",
 	"main": "index.js",
 	"scripts": {

package.json

@@ -1,5 +1,5 @@
 === Super Admin All Sites Menu ===
-Stable tag: 1.7.2
+Stable tag: 1.7.3
 Requires at least: 5.6  
 Tested up to: 6.7  
 Requires PHP: 7.3  
@@ -108,6 +108,14 @@ You can use the following filters to override the defaults:
 
 == Changelog ==
 
+= 1.7.3 =
+* Fixed search functionality:
+  * Improved search performance with better indexing
+  * Added mutation observer to handle dynamically loaded sites
+  * Fixed event handling for search input
+  * Added improved error handling for search elements
+  * Better handling of empty search inputs
+
 = 1.7.2 =
 
 - Bump version to trigger a deploy to WordPress.org

readme.txt

@@ -11,28 +11,74 @@ const debounce = ( fn, delay ) => {
 	};
 };
 
+/**
+ * Add search functionality to the sites menu
+ * @returns {void}
+ */
 export function addSearch() {
+	// Use more specific selector and verify element exists
 	const search = document.querySelector( '#all-sites-search-text' );
-	if ( ! search ) return;
+	if ( ! search ) {
+		console.warn( 'Search input not found' );
+		return;
+	}
+
+	// Get the sites list container
+	const sitesContainer = document.querySelector(
+		'#wp-admin-bar-my-sites-list'
+	);
+	if ( ! sitesContainer ) {
+		console.warn( 'Sites container not found' );
+		return;
+	}
+
+	// Create search index on first load
+	const createSearchIndex = () => {
+		const menuItems =
+			sitesContainer.getElementsByClassName( 'menupop' ) || [];
+		return Array.from( menuItems ).map( ( li ) => ( {
+			element: li,
+			text:
+				li
+					.querySelector( '.ab-item' )
+					?.textContent?.toLowerCase()
+					.trim() || '',
+		} ) );
+	};
 
-	const ul = document.querySelector( '#wp-admin-bar-my-sites-list' );
-	const menuItems = ul?.getElementsByClassName( 'menupop' ) || [];
+	let searchIndex = createSearchIndex();
 
-	// Create index for faster searching
-	const searchIndex = Array.from( menuItems ).map( ( li ) => ( {
-		element: li,
-		text: li.querySelector( '.ab-item' )?.textContent?.toUpperCase() || '',
-	} ) );
+	// Perform search with improved filtering
+	const performSearch = debounce( ( searchTerm ) => {
+		const filter = searchTerm.toLowerCase().trim();
 
-	const performSearch = debounce( ( filter ) => {
-		const upperFilter = filter.toUpperCase();
+		// Show all items if search is empty
+		if ( ! filter ) {
+			searchIndex.forEach( ( { element } ) => {
+				element.style.display = '';
+			} );
+			return;
+		}
+
+		// Filter items
 		searchIndex.forEach( ( { element, text } ) => {
-			element.style.display = text.includes( upperFilter ) ? '' : 'none';
+			element.style.display = text.includes( filter ) ? '' : 'none';
 		} );
 	}, 150 );
 
-	search.addEventListener( 'keyup', ( e ) => {
+	// Add input event listener (catches all input changes)
+	search.addEventListener( 'input', ( e ) => {
 		e.preventDefault();
 		performSearch( e.target.value );
 	} );
+
+	// Re-index when new sites are loaded
+	const observer = new MutationObserver( () => {
+		searchIndex = createSearchIndex();
+	} );
+
+	observer.observe( sitesContainer, {
+		childList: true,
+		subtree: true,
+	} );
 }

src/modules/search.js

@@ -12,7 +12,7 @@
  * Plugin URI: https://github.com/soderlind/super-admin-all-sites-menu
  * GitHub Plugin URI: https://github.com/soderlind/super-admin-all-sites-menu
  * Description: For the super admin, replace WP Admin Bar My Sites menu with an All Sites menu.
- * Version:     1.7.2
+ * Version:     1.7.3
  * Author:      Per Soderlind
  * Network:     true
  * Author URI:  https://soderlind.no
@@ -31,7 +31,7 @@
  * Default values for the plugin.
  */
 const LOADINCREMENTS   = 100; // Number of sites to load at a time.
-const SEARCHTHRESHOLD  = 20; // Number of sites before showing the search box.
+const SEARCHTHRESHOLD  = 2; // Number of sites before showing the search box.
 const CACHE_EXPIRATION = DAY_IN_SECONDS; // Time to cache the site list.
 const ORDERBY          = 'name'; // Order by name.
 const PLUGINS          = [ 'restricted-site-access/restricted_site_access.php' ]; // Plugins triggering update local storages.