Changeset 11612

Timestamp:

02/25/2022 05:46:54 AM (3 years ago)

Author:

dd32

Message:

Trac: When suggesting components, do not suggest 'WordPress.org site' on Meta.

See #6078.

Location:

sites/trunk

Files:

• trac.wordpress.org/templates/site.html (modified) (1 diff)
• wordpress.org/public_html/style/trac/wp-trac.js (modified) (4 diffs)

sites/trunk/trac.wordpress.org/templates/site.html

@@ -5 +5 @@
 
 <?python
-    scripts_version = '166'
+    scripts_version = '167'
     project_slug = req.environ['HTTP_HOST'].split(':')[0].split('.')[0]
     wporg_endpoint = 'https://make.wordpress.org/' + project_slug + '/'

sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js

@@ -1920 +1920 @@
         suggestNotGeneral: ( function() {
             var enabled = true,
-                skipWords = [ 'and', 'any', 'all', 'the', 'for', 'get', 'plugins', 'general' ],
+                skipWords = [ 'and', 'any', 'all', 'the', 'for', 'get', 'plugins', 'general', 'wordpress' ],
+                generalCategories = [ 'General' ],
                 componentWords = {},
                 noticeDiv;
@@ -1927 +1928 @@
                 // Only on new ticket creations.
                 if ( ! wpTrac.isNewTicket() ) {
-                    return;
-                }
-
-                // Only if we have a 'General' option.
-                if ( ! $( '#field-component option[value="General"]' ).length ) {
                     return;
                 }
@@ -1943 +1939 @@
                 }
 
+                // On Meta, WordPress.org site is a "generic" category that shouldn't be used if possible.
+                if ( $( 'body.meta' ).length ) {
+                    generalCategories.push( 'WordPress.org Site' );
+                    skipWords.push( 'wordpress.org' );
+                }
+
+                // Only if we have a 'General' option.
+                const components = jQuery( '#field-component option' ).get().map( opt => opt.value ),
+                    hasDefaultCat = generalCategories.filter( value => components.includes( value ) );
+
+                if ( ! hasDefaultCat ) {
+                    return;
+                }
+
                 generateComponentWords();
 
@@ -1949 +1959 @@
                 // Disable once the user hits the component option.
                 $( '#field-component' ).on( 'change', function() {
-                    // If they selected 'General', keep nagging.
-                    enabled = $(this).find( 'option[value="General"]').prop('selected');
+                    // If they selected a general category keep nagging.
+                    enabled = ( -1 !== generalCategories.indexOf( $(this).val() ) );
 
                     if ( ! enabled && noticeDiv ) {