<!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>[BuddyPress][13130] trunk/src: Directly fetch post author activities into the Latest Activities block</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://buddypress.trac.wordpress.org/changeset/13130">13130</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/13130","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-10-28 13:36:47 +0000 (Thu, 28 Oct 2021)</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'>Directly fetch post author activities into the Latest Activities block
When used into the Post Editor, it's the expected behavior.
Props vapvarun
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8593">#8593</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivityjsblockslatestactivitiesjs">trunk/src/bp-activity/js/blocks/latest-activities.js</a></li>
<li><a href="#trunksrcjsbpactivityjsblockslatestactivitieseditjs">trunk/src/js/bp-activity/js/blocks/latest-activities/edit.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivityjsblockslatestactivitiesjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/js/blocks/latest-activities.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/js/blocks/latest-activities.js 2021-10-21 18:02:52 UTC (rev 13129)
+++ trunk/src/bp-activity/js/blocks/latest-activities.js 2021-10-28 13:36:47 UTC (rev 13130)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,42 +128,60 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * WordPress dependencies.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var _wp = wp,
- InspectorControls = _wp.blockEditor.InspectorControls,
- _wp$components = _wp.components,
- Disabled = _wp$components.Disabled,
- PanelBody = _wp$components.PanelBody,
- RangeControl = _wp$components.RangeControl,
- SelectControl = _wp$components.SelectControl,
- TextControl = _wp$components.TextControl,
- _wp$element = _wp.element,
- Fragment = _wp$element.Fragment,
- createElement = _wp$element.createElement,
- __ = _wp.i18n.__;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const {
+ blockEditor: {
+ InspectorControls
+ },
+ components: {
+ Disabled,
+ PanelBody,
+ RangeControl,
+ SelectControl,
+ TextControl
+ },
+ element: {
+ Fragment,
+ createElement
+ },
+ i18n: {
+ __
+ }
+} = wp;
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * BuddyPress dependencies.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var _bp = bp,
- ServerSideRender = _bp.blockComponents.ServerSideRender,
- _bp$blockData = _bp.blockData,
- currentPostId = _bp$blockData.currentPostId,
- activityTypes = _bp$blockData.activityTypes;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const {
+ blockComponents: {
+ ServerSideRender
+ },
+ blockData: {
+ currentPostId,
+ activityTypes
+ }
+} = bp;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var editDynamicActivitiesBlock = function editDynamicActivitiesBlock(_ref) {
- var attributes = _ref.attributes,
- setAttributes = _ref.setAttributes;
- var postId = attributes.postId,
- maxActivities = attributes.maxActivities,
- type = attributes.type,
- title = attributes.title;
- var post = currentPostId();
- var types = activityTypes();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const editDynamicActivitiesBlock = ({
+ attributes,
+ setAttributes
+}) => {
+ const {
+ postId,
+ maxActivities,
+ type,
+ title
+ } = attributes;
+ const post = currentPostId();
+ const types = activityTypes();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if (!postId && post) {
</span><span class="cx" style="display: block; padding: 0 10px"> setAttributes({
</span><span class="cx" style="display: block; padding: 0 10px"> postId: post
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if (!attributes.postId) {
+ attributes.postId = post;
+ }
</ins><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"> return createElement(Fragment, null, createElement(InspectorControls, null, createElement(PanelBody, {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +191,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }, createElement(TextControl, {
</span><span class="cx" style="display: block; padding: 0 10px"> label: __('Title', 'buddypress'),
</span><span class="cx" style="display: block; padding: 0 10px"> value: title,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- onChange: function onChange(text) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ onChange: text => {
</ins><span class="cx" style="display: block; padding: 0 10px"> setAttributes({
</span><span class="cx" style="display: block; padding: 0 10px"> title: text
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,11 +199,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }), createElement(RangeControl, {
</span><span class="cx" style="display: block; padding: 0 10px"> label: __('Maximum amount to display', 'buddypress'),
</span><span class="cx" style="display: block; padding: 0 10px"> value: maxActivities,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- onChange: function onChange(value) {
- return setAttributes({
- maxActivities: value
- });
- },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ onChange: value => setAttributes({
+ maxActivities: value
+ }),
</ins><span class="cx" style="display: block; padding: 0 10px"> min: 1,
</span><span class="cx" style="display: block; padding: 0 10px"> max: 10,
</span><span class="cx" style="display: block; padding: 0 10px"> required: true
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,7 +210,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> label: __('Type', 'buddypress'),
</span><span class="cx" style="display: block; padding: 0 10px"> value: type,
</span><span class="cx" style="display: block; padding: 0 10px"> options: types,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- onChange: function onChange(option) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ onChange: option => {
</ins><span class="cx" style="display: block; padding: 0 10px"> setAttributes({
</span><span class="cx" style="display: block; padding: 0 10px"> type: option
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,8 +234,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * WordPress dependencies.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var _wp = wp,
- createBlock = _wp.blocks.createBlock;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const {
+ blocks: {
+ createBlock
+ }
+} = wp;
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Transforms Nouveau Activity Widget to Activity Block.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,14 +245,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type {Object}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var transforms = {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const transforms = {
</ins><span class="cx" style="display: block; padding: 0 10px"> from: [{
</span><span class="cx" style="display: block; padding: 0 10px"> type: 'block',
</span><span class="cx" style="display: block; padding: 0 10px"> blocks: ['core/legacy-widget'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- isMatch: function isMatch(_ref) {
- var idBase = _ref.idBase,
- instance = _ref.instance;
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ isMatch: ({
+ idBase,
+ instance
+ }) => {
</ins><span class="cx" style="display: block; padding: 0 10px"> if (!(instance !== null && instance !== void 0 && instance.raw)) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,11 +259,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return idBase === 'bp_latest_activities';
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- transform: function transform(_ref2) {
- var instance = _ref2.instance;
- var regex = /i:\d*;s:\d*:"(.*?)";/gmi;
- var types = [];
- var matches;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ transform: ({
+ instance
+ }) => {
+ const regex = /i:\d*;s:\d*:"(.*?)";/gmi;
+ let types = [];
+ let matches;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> while ((matches = regex.exec(instance.raw.type)) !== null) {
</span><span class="cx" style="display: block; padding: 0 10px"> if (matches.index === regex.lastIndex) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,7 +271,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> regex.lastIndex++;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- matches.forEach(function (match, groupIndex) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ matches.forEach((match, groupIndex) => {
</ins><span class="cx" style="display: block; padding: 0 10px"> if (1 === groupIndex) {
</span><span class="cx" style="display: block; padding: 0 10px"> types.push(match);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,9 +300,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * WordPress dependencies.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var _wp = wp,
- registerBlockType = _wp.blocks.registerBlockType,
- __ = _wp.i18n.__;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const {
+ blocks: {
+ registerBlockType
+ },
+ i18n: {
+ __
+ }
+} = wp;
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Internal dependencies.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcjsbpactivityjsblockslatestactivitieseditjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/bp-activity/js/blocks/latest-activities/edit.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/bp-activity/js/blocks/latest-activities/edit.js 2021-10-21 18:02:52 UTC (rev 13129)
+++ trunk/src/js/bp-activity/js/blocks/latest-activities/edit.js 2021-10-28 13:36:47 UTC (rev 13130)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,6 +41,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! postId && post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> setAttributes( { postId: post } );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! attributes.postId ) {
+ attributes.postId = post;
+ }
</ins><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"> return (
</span></span></pre>
</div>
</div>
</body>
</html>