<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[11537] sites/trunk: Trac: Suggest the correct component when a reporter leaves it as 'General'.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/11537">11537</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/11537","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-02-10 01:13:59 +0000 (Thu, 10 Feb 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Trac: Suggest the correct component when a reporter leaves it as 'General'.
This only matches based on words contained within the Component labels, it would be nice to extend this so that we can have other matching words.
See <a href="http://meta.trac.wordpress.org/ticket/6078">#6078</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunktracwordpressorgtemplatessitehtml">sites/trunk/trac.wordpress.org/templates/site.html</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlstyletracwptracjs">sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunktracwordpressorgtemplatessitehtml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/trac.wordpress.org/templates/site.html</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/trac.wordpress.org/templates/site.html 2022-02-10 00:57:43 UTC (rev 11536)
+++ sites/trunk/trac.wordpress.org/templates/site.html 2022-02-10 01:13:59 UTC (rev 11537)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> py:strip="">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?python
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- scripts_version = '157'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ scripts_version = '158'
</ins><span class="cx" style="display: block; padding: 0 10px"> project_slug = req.environ['HTTP_HOST'].split(':')[0].split('.')[0]
</span><span class="cx" style="display: block; padding: 0 10px"> wporg_endpoint = 'https://make.wordpress.org/' + project_slug + '/'
</span><span class="cx" style="display: block; padding: 0 10px"> is_bug_gardener = 'TICKET_EDIT_DESCRIPTION' in perm(resource)
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlstyletracwptracjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js 2022-02-10 00:57:43 UTC (rev 11536)
+++ sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js 2022-02-10 01:13:59 UTC (rev 11537)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,6 +134,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wpTrac.linkMentions();
</span><span class="cx" style="display: block; padding: 0 10px"> wpTrac.linkGutenbergIssues();
</span><span class="cx" style="display: block; padding: 0 10px"> wpTrac.githubPRs.init();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wpTrac.suggestNotGeneral.init();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $body.hasClass( 'plugins' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wpTrac.workflow.init();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,6 +145,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ isNewTicket: function() {
+ return (
+ window.location.pathname === '/newticket' ||
+ $( 'form[action*="/newticket"]' ).length > 0
+ );
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> showContributorLabels: function( labels ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $( 'h3.change .username' ).each( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var html,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,7 +404,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Rudimentary save alerts for new tickets (summary/description) and comments.
</span><span class="cx" style="display: block; padding: 0 10px"> window.onbeforeunload = function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( window.location.pathname === '/newticket' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wpTrac.isNewTicket() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $( '#field-description' ).val() && ! $( '#field-summary' ).val() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -730,7 +738,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prevent changing to the component if need be.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( window.location.pathname !== '/newticket' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wpTrac.isNewTicket() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> for ( var c in bugTrackerLocations ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! bugTrackerLocations[c].prevent_changing_to ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1848,7 +1856,157 @@
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px"> }()),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ suggestNotGeneral: ( function() {
+ var enabled = true,
+ skipWords = [ 'and', 'any', 'all', 'the', 'for', 'get', 'plugins', 'general' ],
+ componentWords = {},
+ noticeDiv;
+
+ function init() {
+ // Only on new ticket creations.
+ if ( ! wpTrac.isNewTicket() ) {
+ return;
+ }
+
+ // Only if we have a 'General' option.
+ if ( ! $( '#field-component option[value="General"]' ).length ) {
+ return;
+ }
+
+ // bbPress Trac.. has a set of components that I wish everyone had.
+ if ( $( 'body.bbpress' ).length ) {
+ skipWords.push( 'api' );
+ skipWords.push( 'component' );
+ skipWords.push( 'tools' );
+ skipWords.push( 'appearance' );
+ }
+
+ generateComponentWords();
+
+ $( '#field-description,#field-summary,#field-component' ).on( 'blur', maybeSuggest );
+
+ // 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 ( ! enabled && noticeDiv ) {
+ noticeDiv.remove();
+ noticeDiv = false;
+ }
+ } );
+ }
+
+ function maybeSuggest() {
+ var matchText = $( '#field-summary' ).val().toLowerCase() + ' ' + $( '#field-description' ).val().toLowerCase(),
+ matchingWords = [],
+ matchingComponents = [];
+
+ if ( ! enabled || ! matchText.length ) {
+ return;
+ }
+
+ for ( const [word, components] of Object.entries( componentWords ) ) {
+ if ( matchText.includes( word ) ) {
+ matchingWords.push( word );
+ }
+ }
+
+ // Longest match first.
+ matchingWords.sort( (a,b) => a.length > b.length ? -1 : 1 );
+
+ matchingWords.forEach( (word) => {
+ componentWords[ word ].forEach( (component) => {
+ if ( -1 == matchingComponents.indexOf( component ) ) {
+ matchingComponents.push( component );
+ }
+ });
+ } );
+
+ if ( ! noticeDiv ) {
+ noticeDiv = $( '<div id="componentSuggest"/>' ).insertBefore( $( '.buttons').first() );
+ }
+ noticeDiv.html( getNoticeHTML( matchingComponents ) );
+ }
+
+ function getNoticeHTML( matchingComponents ) {
+ var hasMatches = matchingComponents.length > 0,
+ template = $(
+ '<div class="wp-notice"><p><strong>Have you selected the right component?</strong></p>' +
+ "<p>You've not yet selected a component. " +
+ 'Please check the "Component" option above' +
+ ( hasMatches ? ' or select from one of the following:' : '.' ) +
+ '</p>' +
+ '</div>'
+ ),
+ ulList;
+
+ if ( hasMatches ) {
+ template.append( $('<ul/>' ) );
+ ulList = template.find('ul');
+
+ ulList.on( 'click', 'a', function(e) {
+ e.preventDefault();
+ const component = $(this).text();
+
+ $( `#field-component option[value="${component}"]` ).prop( 'selected', 'selected' ).change();
+ } );
+
+ matchingComponents.forEach( (component) => {
+ ulList.append( $( `<li><a href="#">${component}</a></li>` ) );
+ } );
+ }
+
+ return template;
+ }
+
+ function generateComponentWords() {
+ $( '#field-component option' ).each( function() {
+ const component = $(this).val(),
+ words = component.split( /[^A-Za-z0-9\.']+/ )
+
+ // Never suggest General..
+ if ( 'General' === component ) {
+ return;
+ }
+
+ if ( words.length > 1 ) {
+ words.push( component );
+ }
+
+ // If it's a plural, add the non-plural form.
+ words.forEach( (word) => {
+ if ( 's' === word.substr( -1 ) ) {
+ words.push( word.substr( 0, word.length - 1 ) );
+ }
+ } );
+
+ words.forEach( (word) => {
+ if ( ! word ) return;
+
+ word = word.toLowerCase();
+
+ if ( component != word && -1 !== skipWords.indexOf( word ) ) return;
+
+ if ( ! ( word in componentWords ) ) {
+ componentWords[ word ] = [];
+ }
+
+ componentWords[ word ].push( component );
+ } );
+ } );
+
+ return componentWords;
+ }
+
+ return {
+ init: init
+ }
+
+ }() ),
+
</ins><span class="cx" style="display: block; padding: 0 10px"> patchTracFor122Changes: function() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // TODO: This needs to be removed, the Trac assets on s.w.org are probably outdated and need updating.
</ins><span class="cx" style="display: block; padding: 0 10px"> console.log( "wp-trac: Applying compat patches for Trac 1.2.2" );
</span><span class="cx" style="display: block; padding: 0 10px"> // From Trac 1.2.2 threaded_comments.js:
</span><span class="cx" style="display: block; padding: 0 10px"> window.applyCommentsOrder = window.applyCommentsOrder || function() {}
</span></span></pre>
</div>
</div>
</body>
</html>