Changeset 13957

Timestamp:

08/08/2024 11:41:16 PM (19 months ago)

Author:

adamwood

Message:

Learn: Sync with git WordPress/learn@2c73303

Location:

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

Files:

• mu-plugins/pub/locale-switcher/build/style-index-rtl.css (added)
• mu-plugins/pub/locale-switcher/package.json (modified) (1 diff)
• plugins/wporg-learn/build/lesson-archive-excluded-meta.asset.php (modified) (1 diff)
• plugins/wporg-learn/build/lesson-archive-excluded-meta.js (modified) (1 diff)
• plugins/wporg-learn/build/style-block-styles-rtl.css (added)
• plugins/wporg-learn/build/style-course-data-rtl.css (added)
• plugins/wporg-learn/build/style-lesson-plan-actions-rtl.css (added)
• plugins/wporg-learn/build/style-lesson-plan-details-rtl.css (added)
• plugins/wporg-learn/build/style-workshop-details-rtl.css (added)
• plugins/wporg-learn/inc/taxonomy.php (modified) (2 diffs)
• plugins/wporg-learn/js/lesson-archive-excluded-meta/index.js (modified) (1 diff)
• plugins/wporg-learn/package.json (modified) (1 diff)
• themes/pub/wporg-learn-2024/inc/query.php (modified) (2 diffs)
• themes/pub/wporg-learn-2024/package.json (modified) (1 diff)
• themes/pub/wporg-learn-2024/style.css (modified) (1 diff)
• themes/pub/wporg-learn-2024/webpack.config.js (deleted)

sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/locale-switcher/package.json

@@ -21 +21 @@
     },
     "devDependencies": {
-        "@wordpress/scripts": "27.2.0"
+        "@wordpress/scripts": "27.9.0"
     },
     "stylelint": {

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/build/lesson-archive-excluded-meta.asset.php

@@ -1 @@
-<?php return array('dependencies' => array('react', 'wp-components', 'wp-data', 'wp-edit-post', 'wp-element', 'wp-i18n', 'wp-plugins'), 'version' => '8d2e083e22101415fb2c');
+<?php return array('dependencies' => array('react', 'wp-components', 'wp-data', 'wp-edit-post', 'wp-element', 'wp-i18n', 'wp-plugins'), 'version' => 'fe14a0882f738a5bdaea');

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/build/lesson-archive-excluded-meta.js

@@ -1 @@
-(()=>{"use strict";const e=window.React,t=window.wp.components,n=window.wp.data,o=window.wp.editPost,i=window.wp.element,l=window.wp.i18n,d=window.wp.plugins,r="excluded";(0,d.registerPlugin)("wporg-learn-lesson-archive-excluded-meta",{render:()=>{const d=(0,n.useSelect)((e=>e("core/editor").getEditedPostAttribute("meta")||{})),{editPost:c}=(0,n.useDispatch)("core/editor"),[s,w]=(0,i.useState)(d?._lesson_archive_excluded===r);return(0,e.createElement)(o.PluginDocumentSettingPanel,{title:(0,l.__)("Hidden Lesson","wporg-learn")},(0,e.createElement)(t.PanelRow,null,(0,e.createElement)(t.CheckboxControl,{label:(0,l.__)("Exclude this lesson from the archive","wporg-learn"),checked:s,onChange:e=>{w(e),c({meta:{...d,_lesson_archive_excluded:e?r:""}})}})))}})})();
+(()=>{"use strict";const e=window.React,t=window.wp.components,n=window.wp.data,o=window.wp.editPost,d=window.wp.element,i=window.wp.i18n,l=window.wp.plugins,r="excluded";(0,l.registerPlugin)("wporg-learn-lesson-archive-excluded-meta",{render:()=>{const l=(0,n.useSelect)((e=>e("core/editor").getEditedPostAttribute("meta")||{})),{editPost:c}=(0,n.useDispatch)("core/editor"),[s,w]=(0,d.useState)(l?._lesson_archive_excluded===r);return(0,e.createElement)(o.PluginDocumentSettingPanel,{title:(0,i.__)("Hidden Lesson (deprecated)","wporg-learn")},(0,e.createElement)(t.PanelRow,null,(0,e.createElement)(t.CheckboxControl,{label:(0,i.__)("Exclude this lesson from the archive","wporg-learn"),checked:s,onChange:e=>{w(e),c({meta:{...l,_lesson_archive_excluded:e?r:""}})}})))}})})();

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/taxonomy.php

@@ -28 +28 @@
     register_lesson_level();
     register_lesson_plan_series();
+    register_lesson_visibility();
     register_workshop_series();
     register_workshop_type();
@@ -259 +260 @@
 
     register_taxonomy( 'level', array( 'lesson-plan', 'lesson', 'course' ), $args );
+}
+
+/**
+ * Register the Lesson visibility taxonomy, used to hide lessons from the archive and search views.
+ */
+function register_lesson_visibility() {
+    $labels = array(
+        'name'                       => _x( 'Visibility', 'Taxonomy General Name', 'wporg-learn' ),
+        'singular_name'              => _x( 'Visibility', 'Taxonomy Singular Name', 'wporg-learn' ),
+        'menu_name'                  => __( 'Visibility', 'wporg-learn' ),
+        'all_items'                  => __( 'All Visibilities', 'wporg-learn' ),
+        'parent_item'                => __( 'Parent Visibility', 'wporg-learn' ),
+        'parent_item_colon'          => __( 'Parent Visibility:', 'wporg-learn' ),
+        'new_item_name'              => __( 'New Visibility Name', 'wporg-learn' ),
+        'add_new_item'               => __( 'Add New Visibility', 'wporg-learn' ),
+        'edit_item'                  => __( 'Edit Visibility', 'wporg-learn' ),
+        'update_item'                => __( 'Update Visibility', 'wporg-learn' ),
+        'view_item'                  => __( 'View Visibility', 'wporg-learn' ),
+        'separate_items_with_commas' => __( 'Separate visibilities with commas', 'wporg-learn' ),
+        'add_or_remove_items'        => __( 'Add or remove visibilities', 'wporg-learn' ),
+        'choose_from_most_used'      => __( 'Choose from the most used', 'wporg-learn' ),
+        'popular_items'              => __( 'Popular Visibilities', 'wporg-learn' ),
+        'search_items'               => __( 'Search Visibilities', 'wporg-learn' ),
+        'not_found'                  => __( 'No Visibilities Found', 'wporg-learn' ),
+        'no_terms'                   => __( 'No visibilities', 'wporg-learn' ),
+        'items_list'                 => __( 'Visibilities list', 'wporg-learn' ),
+        'items_list_navigation'      => __( 'Visibilities list navigation', 'wporg-learn' ),
+    );
+
+    $args = array(
+        'labels'            => $labels,
+        'hierarchical'      => true,
+        'public'            => true,
+        'query_var'         => 'wporg_lesson_visibility', // Prevent collisions with query params in the archive filter.
+        'show_ui'           => true,
+        'show_admin_column' => true,
+        'show_in_nav_menus' => true,
+        'show_tagcloud'     => false,
+        'show_in_rest'      => true,
+        'rewrite'           => false,
+        'capabilities'      => array(
+            'manage_terms' => 'manage_categories',
+            'edit_terms'   => 'manage_categories',
+            'delete_terms' => 'manage_categories',
+            'assign_terms' => 'edit_lessons',
+        ),
+    );
+
+    // Use an existing taxonomy registered with Jetpack Search
+    // See https://github.com/Automattic/jetpack/blob/36b2d5232e2ec3a1ad14034ab673fddce3acab97/projects/packages/sync/src/modules/class-search.php#L1479
+    register_taxonomy( 'show', array( 'lesson' ), $args );
 }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/js/lesson-archive-excluded-meta/index.js

@@ -17 +17 @@
 
     return (
-        <PluginDocumentSettingPanel title={ __( 'Hidden Lesson', 'wporg-learn' ) }>
+        <PluginDocumentSettingPanel title={ __( 'Hidden Lesson (deprecated)', 'wporg-learn' ) }>
             <PanelRow>
                 <CheckboxControl

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/package.json

@@ -28 +28 @@
     },
     "devDependencies": {
-        "@wordpress/scripts": "27.2.0"
+        "@wordpress/scripts": "27.9.0"
     },
     "stylelint": {

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/inc/query.php

@@ -53 +53 @@
     if ( ! is_admin() && $query->is_main_query() && ( $query->is_archive( 'lesson' ) || $query->is_search() ) ) {
         $meta_query = $query->get( 'meta_query', array() );
+        $tax_query = $query->get( 'tax_query', array() );
 
-        $exclude_lesson_query = array(
+        $exclude_lessons_by_post_meta = array(
             'relation' => 'OR',
             array(
@@ -72 +73 @@
                 'relation' => 'AND',
                 $meta_query,
-                $exclude_lesson_query,
+                $exclude_lessons_by_post_meta,
             );
         } else {
-            $meta_query = $exclude_lesson_query;
+            $meta_query = $exclude_lessons_by_post_meta;
+        }
+
+        $exclude_lessons_by_taxonomy = array(
+            'taxonomy' => 'show',
+            'field'    => 'slug',
+            'terms'    => 'hidden',
+            'operator' => 'NOT IN',
+        );
+
+        // If there's an existing tax query, add the new condition
+        if ( ! empty( $tax_query ) ) {
+            $tax_query['relation'] = 'AND';
+            $tax_query[] = $exclude_lessons_by_taxonomy;
+        } else {
+            $tax_query = array( $exclude_lessons_by_taxonomy );
         }
 
         $query->set( 'meta_query', $meta_query );
+        $query->set( 'tax_query', $tax_query );
     }
 }

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/package.json

@@ -8 +8 @@
     "devDependencies": {
         "@wordpress/icons": "^10.2.0",
-        "@wordpress/scripts": "27.2.0",
-        "react-dom": "^18.3.1",
-        "rtlcss-webpack-plugin": "4.0.7"
+        "@wordpress/scripts": "27.9.0",
+        "react-dom": "^18.3.1"
     },
     "eslintConfig": {

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/style.css

@@ -5 +5 @@
  * Author URI: http://wordpress.org/
  * Description: A theme for learn.wordpress.org, built in 2024.
- * Version: 1.0.0-6ed3a3d
+ * Version: 1.0.0-bbe9ed4
  * License: GNU General Public License v2 or later
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html