Changeset 13692

Timestamp:

05/13/2024 02:05:49 AM (2 years ago)

Author:

dufresnesteven

Message:

wporg-plugins-2024: Turn on experimental directory filters for non-search views behind "show_filters" query var.
Note: Filters are not complete. Use at your own risk :).

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024

Files:

• build/blocks/category-navigation/render.php (modified) (1 diff)
• build/blocks/filter-bar/render.php (modified) (1 diff)
• inc/block-config.php (modified) (4 diffs)
• src/blocks/category-navigation/render.php (modified) (1 diff)
• src/blocks/filter-bar/render.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/build/blocks/category-navigation/render.php

@@ -8 +8 @@
 }
 
+if ( ! is_search() && isset( $_GET['show_filters'] ) ) {
+        $filter_blocks = <<<FILTERS
+        <!-- wp:group {"style":{"spacing":{"blockGap":"0"}},"className":"wporg-query-filters","layout":{"type":"flex","flexWrap":"nowrap"}} -->
+        <div class="wp-block-group wporg-query-filters">
+                <!-- wp:wporg/query-filter {"key":"business_model","multiple":false} /-->
+                <!-- wp:wporg/query-filter {"key":"plugin_category"} /-->
+                <!-- wp:wporg/query-filter {"key":"sort","multiple":false} /-->
+        </div>
+        <!-- /wp:group -->
+        FILTERS;
+
+        echo do_blocks( $filter_blocks );
+
+        return;
+}
+
 echo do_blocks( '<!-- wp:navigation {"menuSlug":"section-bar","ariaLabel":"'. esc_attr( 'Category menu', 'wporg-plugins' ) .'","overlayMenu":"never","layout":{"type":"flex","orientation":"horizontal","justifyContent":"left","flexWrap":"nowrap"},"fontSize":"small","className":"is-style-button-list"} /-->' );

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/build/blocks/filter-bar/render.php

@@ -7 +7 @@
         return '';
 }
-
-$filter_blocks = <<<FILTERS
-        <!-- wp:group {"style":{"spacing":{"blockGap":"0"}},"className":"wporg-query-filters","layout":{"type":"flex","flexWrap":"nowrap"}} -->
-        <div class="wp-block-group wporg-query-filters">
-                <!-- wp:wporg/query-filter {"key":"business_model","multiple":false} /-->
-                <!-- wp:wporg/query-filter {"key":"sort","multiple":false} /-->
-        </div>
-        <!-- /wp:group -->
-        FILTERS;
-
-// Temporarily disable the filters.
-$filter_blocks = '';
 
 $search_placeholder = esc_attr__( 'Search plugins', 'wporg-plugins' );

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

@@ -9 +9 @@
 add_filter( 'wporg_query_filter_options_sort', __NAMESPACE__ . '\wporg_query_filter_options_sort' );
 add_filter( 'wporg_query_filter_options_business_model', __NAMESPACE__ . '\wporg_query_filter_options_business_model' );
+add_filter( 'wporg_query_filter_options_plugin_category', __NAMESPACE__ . '\wporg_query_filter_options_plugin_category' );
 add_filter( 'wporg_query_filter_in_form', __NAMESPACE__ . '\wporg_query_filter_in_form' );
 add_filter( 'wporg_query_total_label', __NAMESPACE__ . '\wporg_query_total_label', 10, 2 );
@@ -129 +130 @@
 function wporg_query_filter_options_business_model() {
         $options = array(
+                'all'        => __( 'All', 'wporg-plugins' ),
                 'commercial' => __( 'Commercial', 'wporg-plugins' ),
-                'community' => __( 'Community', 'wporg-plugins' ),
+                'community'  => __( 'Community', 'wporg-plugins' ),
         );
         $label = __( 'Type', 'wporg-plugins' );
@@ -144 +146 @@
                 'options'  => $options ,
                 'selected' => [ get_query_var( 'plugin_business_model' ) ],
+        );
+}
+
+function wporg_query_filter_options_plugin_category() {
+        $options = [];
+
+        foreach ( get_terms( 'plugin_category', [ 'hide_empty' => true ] ) as $term ) {
+                $options[ $term->slug ] = $term->name;
+        }
+        
+        $count = count( (array) get_query_var( 'plugin_category' ) );
+        $label = sprintf(
+                /* translators: The dropdown label for filtering, %s is the selected term count. */
+                _n( 'Categories <span>%s</span>', 'Categories <span>%s</span>', number_format_i18n( $count ), 'wporg-plugins' ),
+                $count
+        );
+        
+        return array(
+                'label'    => $label,
+                'title'    => __( 'Category', 'wporg-plugins' ),
+                'key'      => 'plugin_category',
+                'action'   => '',
+                'options'  => $options,
+                'selected' => (array) get_query_var( 'plugin_category' ),
         );
 }
@@ -186 +212 @@
         }
 
+        // Temporary for feature flag
+        if ( isset( $_GET['show_filters'] )  ) {
+                echo '<input type="hidden" name="show_filters" value="1" />';
+        }
+
 }
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/src/blocks/category-navigation/render.php

@@ -8 +8 @@
 }
 
+if ( ! is_search() && isset( $_GET['show_filters'] ) ) {
+        $filter_blocks = <<<FILTERS
+        <!-- wp:group {"style":{"spacing":{"blockGap":"0"}},"className":"wporg-query-filters","layout":{"type":"flex","flexWrap":"nowrap"}} -->
+        <div class="wp-block-group wporg-query-filters">
+                <!-- wp:wporg/query-filter {"key":"business_model","multiple":false} /-->
+                <!-- wp:wporg/query-filter {"key":"plugin_category"} /-->
+                <!-- wp:wporg/query-filter {"key":"sort","multiple":false} /-->
+        </div>
+        <!-- /wp:group -->
+        FILTERS;
+
+        echo do_blocks( $filter_blocks );
+
+        return;
+}
+
 echo do_blocks( '<!-- wp:navigation {"menuSlug":"section-bar","ariaLabel":"'. esc_attr( 'Category menu', 'wporg-plugins' ) .'","overlayMenu":"never","layout":{"type":"flex","orientation":"horizontal","justifyContent":"left","flexWrap":"nowrap"},"fontSize":"small","className":"is-style-button-list"} /-->' );

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/src/blocks/filter-bar/render.php

@@ -7 +7 @@
         return '';
 }
-
-$filter_blocks = <<<FILTERS
-        <!-- wp:group {"style":{"spacing":{"blockGap":"0"}},"className":"wporg-query-filters","layout":{"type":"flex","flexWrap":"nowrap"}} -->
-        <div class="wp-block-group wporg-query-filters">
-                <!-- wp:wporg/query-filter {"key":"business_model","multiple":false} /-->
-                <!-- wp:wporg/query-filter {"key":"sort","multiple":false} /-->
-        </div>
-        <!-- /wp:group -->
-        FILTERS;
-
-// Temporarily disable the filters.
-$filter_blocks = '';
 
 $search_placeholder = esc_attr__( 'Search plugins', 'wporg-plugins' );