MDL-66893 mod_forum: show expand conversation in nested view

lib/amd/src/modal.js

@@ -343,9 +343,12 @@ define(['jquery', 'core/templates', 'core/notification', 'core/key_codes',
                         this.bodyJS = js;
                     }
                 }
+
+                return result;
+            }.bind(this))
+            .then(function(result) {
                 Event.notifyFilterContentUpdated(body);
                 this.getRoot().trigger(ModalEvents.bodyRendered, this);
-
                 return result;
             }.bind(this))
             .fail(Notification.exception)

mod/forum/amd/build/grades/expandconversation.min.js

@@ -1,2 +1,2 @@
-define ("mod_forum/grades/expandconversation",["exports","./grader/selectors","mod_forum/repository","core/notification","core/templates","core/modal_factory","core/modal_events"],function(a,b,c,d,e,f,g){"use strict";Object.defineProperty(a,"__esModule",{value:!0});a.registerEventListeners=void 0;b=i(b);c=h(c);e=h(e);f=i(f);g=i(g);function h(a){return a&&a.__esModule?a:{default:a}}function i(a){if(a&&a.__esModule){return a}else{var b={};if(null!=a){for(var c in a){if(Object.prototype.hasOwnProperty.call(a,c)){var d=Object.defineProperty&&Object.getOwnPropertyDescriptor?Object.getOwnPropertyDescriptor(a,c):{};if(d.get||d.set){Object.defineProperty(b,c,d)}else{b[c]=a[c]}}}}b.default=a;return b}}function j(a,b){return m(a)||l(a,b)||k()}function k(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}function l(a,b){var c=[],d=!0,e=!1,f=void 0;try{for(var g=a[Symbol.iterator](),h;!(d=(h=g.next()).done);d=!0){c.push(h.value);if(b&&c.length===b)break}}catch(a){e=!0;f=a}finally{try{if(!d&&null!=g["return"])g["return"]()}finally{if(e)throw f}}return c}function m(a){if(Array.isArray(a))return a}function n(a,b,c,d,e,f,g){try{var h=a[f](g),i=h.value}catch(a){c(a);return}if(h.done){b(i)}else{Promise.resolve(i).then(d,e)}}function o(a){return function(){var b=this,c=arguments;return new Promise(function(d,e){var h=a.apply(b,c);function f(a){n(h,d,e,f,g,"next",a)}function g(a){n(h,d,e,f,g,"throw",a)}f(void 0)})}}var p=function(a){return a.closest(b.expandConversation)},q=function(){var a=o(regeneratorRuntime.mark(function a(b){var d,h,i,k,l,m,n,o,p;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:d=b.dataset.postid;h=b.dataset.discussionid;i=b.dataset.name;a.next=5;return Promise.all([c.default.getDiscussionPosts(parseInt(h)),f.create({title:i,large:!0,type:f.types.CANCEL})]);case 5:k=a.sent;l=j(k,2);m=l[0];n=l[1];o=m.posts.map(function(a){a.subject=null;a.readonly=!0;a.html.rating=null;return a});n.getRoot().on(g.hidden,function(){n.destroy()});n.show();p=e.default.render("mod_forum/grades/grader/discussion/post_modal",o);n.setBody(p);p.then(function(){var a=n.getRoot()[0].querySelector("#p".concat(d));if(a){a.scrollIntoView({behavior:"smooth"})}return});case 15:case"end":return a.stop();}}},a)}));return function(){return a.apply(this,arguments)}}();a.registerEventListeners=function registerEventListeners(a){a.addEventListener("click",function(a){var b=p(a.target);if(b){a.preventDefault();try{q(b)}catch(a){(0,d.exception)(a)}}})}});
+define ("mod_forum/grades/expandconversation",["exports","./grader/selectors","mod_forum/repository","core/notification","core/templates","core/modal_factory","core/modal_events"],function(a,b,c,d,e,f,g){"use strict";Object.defineProperty(a,"__esModule",{value:!0});a.registerEventListeners=void 0;b=i(b);c=h(c);e=h(e);f=i(f);g=i(g);function h(a){return a&&a.__esModule?a:{default:a}}function i(a){if(a&&a.__esModule){return a}else{var b={};if(null!=a){for(var c in a){if(Object.prototype.hasOwnProperty.call(a,c)){var d=Object.defineProperty&&Object.getOwnPropertyDescriptor?Object.getOwnPropertyDescriptor(a,c):{};if(d.get||d.set){Object.defineProperty(b,c,d)}else{b[c]=a[c]}}}}b.default=a;return b}}function j(a,b){return m(a)||l(a,b)||k()}function k(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}function l(a,b){var c=[],d=!0,e=!1,f=void 0;try{for(var g=a[Symbol.iterator](),h;!(d=(h=g.next()).done);d=!0){c.push(h.value);if(b&&c.length===b)break}}catch(a){e=!0;f=a}finally{try{if(!d&&null!=g["return"])g["return"]()}finally{if(e)throw f}}return c}function m(a){if(Array.isArray(a))return a}function n(a,b,c,d,e,f,g){try{var h=a[f](g),i=h.value}catch(a){c(a);return}if(h.done){b(i)}else{Promise.resolve(i).then(d,e)}}function o(a){return function(){var b=this,c=arguments;return new Promise(function(d,e){var h=a.apply(b,c);function f(a){n(h,d,e,f,g,"next",a)}function g(a){n(h,d,e,f,g,"throw",a)}f(void 0)})}}var p=function(a){return a.closest(b.expandConversation)},q=function(){var a=o(regeneratorRuntime.mark(function a(b){var d,h,i,k,l,m,n,o,p,q;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:d=b.dataset.postid;h=b.dataset.discussionid;i=b.dataset.name;a.next=5;return Promise.all([c.default.getDiscussionPosts(parseInt(h)),f.create({title:i,large:!0,type:f.types.CANCEL})]);case 5:k=a.sent;l=j(k,2);m=l[0];n=l[1];o=new Map(m.posts.map(function(a){a.readonly=!0;a.hasreplies=!1;a.replies=[];return[a.id,a]}));p=[];m.posts.forEach(function(a){if(a.parentid){var b=o.get(a.parentid);if(b){b.hasreplies=!0;b.replies.push(a)}else{p.push(a)}}else{p.push(a)}});n.getRoot().on(g.hidden,function(){n.destroy()});n.getRoot().on(g.bodyRendered,function(){var a=n.getRoot()[0].querySelector("#p".concat(d));if(a){a.scrollIntoView({behavior:"smooth"})}});n.show();q=e.default.render("mod_forum/grades/grader/discussion/post_modal",{posts:p});n.setBody(q);case 17:case"end":return a.stop();}}},a)}));return function(){return a.apply(this,arguments)}}();a.registerEventListeners=function registerEventListeners(a){a.addEventListener("click",function(a){var b=p(a.target);if(b){a.preventDefault();try{q(b)}catch(a){(0,d.exception)(a)}}})}});
 //# sourceMappingURL=expandconversation.min.js.map

mod/forum/amd/src/grades/expandconversation.js

@@ -58,12 +58,26 @@ const showPostInContext = async(rootNode) => {
         }),
     ]);
 
-    const userPosts = allPosts.posts.map((post) => {
-        post.subject = null;
+    const postsById = new Map(allPosts.posts.map(post => {
         post.readonly = true;
-        post.html.rating = null;
+        post.hasreplies = false;
+        post.replies = [];
+        return [post.id, post];
+    }));
 
-        return post;
+    let posts = [];
+    allPosts.posts.forEach(post => {
+        if (post.parentid) {
+            const parent = postsById.get(post.parentid);
+            if (parent) {
+                parent.hasreplies = true;
+                parent.replies.push(post);
+            } else {
+                posts.push(post);
+            }
+        } else {
+            posts.push(post);
+        }
     });
 
     // Handle hidden event.
@@ -72,20 +86,18 @@ const showPostInContext = async(rootNode) => {
         modal.destroy();
     });
 
-    modal.show();
-
-    // Note: We do not use await here because it messes with the Modal transitions.
-    const templatePromise = Templates.render('mod_forum/grades/grader/discussion/post_modal', userPosts);
-    modal.setBody(templatePromise);
-    // eslint-disable-next-line promise/catch-or-return
-    templatePromise.then(() => {
+    modal.getRoot().on(ModalEvents.bodyRendered, () => {
         const relevantPost = modal.getRoot()[0].querySelector(`#p${postId}`);
         if (relevantPost) {
             relevantPost.scrollIntoView({behavior: "smooth"});
         }
-
-        return;
     });
+
+    modal.show();
+
+    // Note: We do not use await here because it messes with the Modal transitions.
+    const templatePromise = Templates.render('mod_forum/grades/grader/discussion/post_modal', {posts});
+    modal.setBody(templatePromise);
 };
 
 /**

mod/forum/templates/grades/grader/discussion/post_modal.mustache

@@ -30,7 +30,7 @@
     }
 }}
 <div data-region="posts-modal">
-    {{#.}}
-        {{> mod_forum/forum_discussion_nested_v2_post_reply }}
-    {{/.}}
+    {{#posts}}
+        {{> mod_forum/forum_discussion_nested_post }}
+    {{/posts}}
 </div>