Changeset 13349

Timestamp:

03/15/2024 07:16:32 AM (2 years ago)

Author:

dd32

Message:

wporg-plugins-2024: Attempt to support retaining the filters for searches.

This has many rough edges, as the UI doesn't match the WordPress template heirachy that was never designed for combination views.

Location:

sites/trunk/wordpress.org/public_html/wp-content

Files:

• plugins/plugin-directory/class-plugin-directory.php (modified) (5 diffs)
• themes/pub/wporg-plugins-2024/inc/block-config.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php

@@ -1022 +1022 @@
                 break;
 
+            case 'ratings':
+                $wp_query->query_vars['orderby'] = 'num_ratings';
+                // Fall through.
             case 'num_ratings':
-            case 'ratings':
                 $wp_query->query_vars['meta_query']['num_ratings'] ??= [
                     'key'     => 'num_ratings',
@@ -1030 +1032 @@
                     'value'   => 0,
                 ];
-
-                $wp_query->query_vars['orderby']  = 'num_ratings';
                 break;
 
             case '_active_installs':
+                $wp_query->query_vars['orderby']  = 'active_installs';
+                // Fall through.
             case 'active_installs':
                 $wp_query->query_vars['meta_query']['active_installs'] ??= [
@@ -1041 +1043 @@
                     'compare' => 'EXISTS'
                 ];
-
-                $wp_query->query_vars['orderby']  = 'active_installs';
                 break;
 
@@ -1067 +1067 @@
                     'compare' => 'EXISTS',
                 ];
-                $wp_query->query_vars['orderby']  = 'downloads';
                 break;
         }
@@ -1468 +1467 @@
         // New-style search links.
         if ( get_query_var( 's' ) && isset( $_GET['s'] ) ) {
-            $url = site_url( '/search/' . urlencode( get_query_var( 's' ) ) . '/' );
-            if ( get_query_var( 'block_search' ) ) {
-                $url = add_query_arg( 'block_search', get_query_var( 'block_search' ), $url );
+            $url        = site_url( '/search/' . urlencode( get_query_var( 's' ) ) . '/' );
+            $query_vars = array_filter( $wp_query->query );
+
+            // Don't need the search..
+            unset( $query_vars['s'] );
+
+            // Temporary: Disable sorts for search.
+            unset( $query_vars['order'], $query_vars['orderby'] );
+
+            if ( ! empty( $query_vars ) ) {
+                $url = add_query_arg( $query_vars, $url );
             }
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/inc/block-config.php

@@ -130 +130 @@
         $values = (array) $values;
         foreach ( $values as $value ) {
-            // Support for tax archives... TODO Hacky..
-            // Realistically we should just ditch these and have all of the filters hit /search/?stuff=goes&here
-            if ( is_tax() && $value === ( get_queried_object()->slug ?? '' ) ) {
+            if ( is_search() && 's' === $query_var ) {
                 continue;
-            } elseif ( is_search() && 's' === $query_var ) {
+            } elseif ( 'plugin_tags' === $query_var ) {
+                // We don't support tags yet as a filter.
                 continue;
+            } elseif ( 'browse' === $query_var ) {
+                // Don't retain if there's no actual items in the section (ie. it's dynamic).
+                $term = get_term_by( 'slug', $value, 'plugin_section' );
+                if ( ! $term || ! $term->count ) {
+                    continue;
+                }
             }
 
@@ -146 +151 @@
     }
 
+    // If this is a block directory search, that needs to be retained too.
+    if ( is_search() && get_query_var( 'block_search' ) ) {
+        echo '<input type="hidden" name="block_search" value="1" />';
+    }
+
 }
 
@@ -153 +163 @@
 
 /**
- * Filters the search block to remove required attribute.
+ * Filters the search block to remove the required attribute, and add the query fields.
  *
  * @param string $block_content
@@ -164 +174 @@
     }
 
-    return preg_replace( '/(<input[^>]*)\s+required\s*([^>]*)>/', '$1$2>', $block_content );
+    // Remove the required attribute
+    $block_content = preg_replace( '/(<input[^>]*)\s+required\s*([^>]*)>/', '$1$2>', $block_content );
+
+    // Insert the current query filters into the search form.
+    ob_start();
+    wporg_query_filter_in_form( 's' );
+    $block_content = str_replace( '</form>', ob_get_clean() . '</form>', $block_content );
+
+    return $block_content;
 }