From 3f34802b495b6e568530f66ece264f4a160d881b Mon Sep 17 00:00:00 2001
From: Davide Iadeluca <davide.iadeluca@glowingblue.com>
Date: Tue, 17 Sep 2024 12:06:45 +0200
Subject: [PATCH 1/2] refactor(core): improve extensibility of `IndexPage`

---
 .../js/src/forum/components/IndexPage.tsx     | 34 +++++++++++++++----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/framework/core/js/src/forum/components/IndexPage.tsx b/framework/core/js/src/forum/components/IndexPage.tsx
index 404eb3487d..7991610f32 100644
--- a/framework/core/js/src/forum/components/IndexPage.tsx
+++ b/framework/core/js/src/forum/components/IndexPage.tsx
@@ -60,19 +60,39 @@ export default class IndexPage<CustomAttrs extends IIndexPageAttrs = IIndexPageA
             <nav className="IndexPage-nav sideNav">
               <ul>{listItems(this.sidebarItems().toArray())}</ul>
             </nav>
-            <div className="IndexPage-results sideNavOffset">
-              <div className="IndexPage-toolbar">
-                <ul className="IndexPage-toolbar-view">{listItems(this.viewItems().toArray())}</ul>
-                <ul className="IndexPage-toolbar-action">{listItems(this.actionItems().toArray())}</ul>
-              </div>
-              <DiscussionList state={app.discussions} />
-            </div>
+            <div className="IndexPage-results sideNavOffset">{this.contentItems().toArray()}</div>
           </div>
         </div>
       </div>
     );
   }
 
+  contentItems(): ItemList<Mithril.Children> {
+    const items = new ItemList<Mithril.Children>();
+
+    items.add('toolbar', this.toolbarView(), 100);
+    items.add('discussionList', this.discussionListView(), 90);
+
+    return items;
+  }
+
+  toolbarView(): Mithril.Children {
+    return <div className="IndexPage-toolbar">{this.toolbarItems().toArray()}</div>;
+  }
+
+  discussionListView(): Mithril.Children {
+    return <DiscussionList state={app.discussions} />;
+  }
+
+  toolbarItems(): ItemList<Mithril.Children> {
+    const items = new ItemList<Mithril.Children>();
+
+    items.add('view', <ul className="IndexPage-toolbar-view">{listItems(this.viewItems().toArray())}</ul>, 100);
+    items.add('action', <ul className="IndexPage-toolbar-action">{listItems(this.actionItems().toArray())}</ul>, 90);
+
+    return items;
+  }
+
   setTitle() {
     app.setTitle(extractText(app.translator.trans('core.forum.index.meta_title_text')));
     app.setTitleCount(0);

From 2b87b2f748d5c9154b67aa1800f18bbb5adb7612 Mon Sep 17 00:00:00 2001
From: Davide Iadeluca <davide.iadeluca@glowingblue.com>
Date: Tue, 17 Sep 2024 12:11:41 +0200
Subject: [PATCH 2/2] refactor(core): refactor the extensibility refactor

---
 framework/core/js/src/forum/components/IndexPage.tsx | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/framework/core/js/src/forum/components/IndexPage.tsx b/framework/core/js/src/forum/components/IndexPage.tsx
index 7991610f32..fb944ea532 100644
--- a/framework/core/js/src/forum/components/IndexPage.tsx
+++ b/framework/core/js/src/forum/components/IndexPage.tsx
@@ -70,20 +70,12 @@ export default class IndexPage<CustomAttrs extends IIndexPageAttrs = IIndexPageA
   contentItems(): ItemList<Mithril.Children> {
     const items = new ItemList<Mithril.Children>();
 
-    items.add('toolbar', this.toolbarView(), 100);
-    items.add('discussionList', this.discussionListView(), 90);
+    items.add('toolbar', <div className="IndexPage-toolbar">{this.toolbarItems().toArray()}</div>, 100);
+    items.add('discussionList', <DiscussionList state={app.discussions} />, 90);
 
     return items;
   }
 
-  toolbarView(): Mithril.Children {
-    return <div className="IndexPage-toolbar">{this.toolbarItems().toArray()}</div>;
-  }
-
-  discussionListView(): Mithril.Children {
-    return <DiscussionList state={app.discussions} />;
-  }
-
   toolbarItems(): ItemList<Mithril.Children> {
     const items = new ItemList<Mithril.Children>();