Fix new forum post content resetting (#567)

Co-authored-by: matteo <[email protected]> Co-authored-by: Matteo Bronkhorst <[email protected]>
csvalpha · Nov 19, 2022 · 4da9761 · 4da9761
1 parent 04db56b
commit 4da9761
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 11 deletions.
diff --git a/app/components/forum/forum-post-new.hbs b/app/components/forum/forum-post-new.hbs
@@ -1,5 +1,5 @@
 <p class='card-text'>
-  <MdEditor @content={{content}} @textareaId='newForumPost' />
+  <MdEditor @content={{this.content}} @textareaId='newForumPost' />
 </p>
 <div class='card-footer'>
   <div class='row justify-content-end'>

diff --git a/app/components/forum/forum-post-new.js b/app/components/forum/forum-post-new.js
@@ -1,24 +1,32 @@
 import { inject as service } from '@ember/service';
-import Component from '@ember/component';
+import Component from '@glimmer/component';
 import { action } from '@ember/object';
 
 // todo: incorporate the model-save-util into components?
 export default class ForumPostNewComponent extends Component {
   @service store;
   @service flashNotice;
 
+  get content() {
+    return this.args.content;
+  }
+
+  set content(content) {
+    this.args.updateContent(content);
+  }
+
   @action
   async save() {
-    let { content, thread } = this;
+    let { content, thread } = this.args;
     await this.store
       .createRecord('forum/post', {
         message: content,
         thread,
       })
       .save();
     this.flashNotice.sendSuccess('Forumbericht toegevoegd!');
-    this.set('content', '');
-    this.onSubmit();
+    this.content = '';
+    this.args.onSubmit();
   }
 
   @action

diff --git a/app/controllers/forum/categories/category/threads/thread/posts/index.js b/app/controllers/forum/categories/category/threads/thread/posts/index.js
@@ -7,8 +7,7 @@ import { tracked } from '@glimmer/tracking';
 export default class PostsIndexController extends Controller {
   @service session;
   @service store;
-  @tracked
-  newContent = '';
+  @tracked newContent = '';
 
   queryParams = ['page'];
 
@@ -55,8 +54,12 @@ export default class PostsIndexController extends Controller {
 
   @action
   async addQuote(q) {
-    this.set('newContent', `${this.newContent}${q} \n\n`);
-
+    if (!this.newContent?.endsWith('\n')) {
+      // insert a newline in between if necessary
+      this.newContent = `${this.newContent}\n${q} \n\n`;
+    } else {
+      this.newContent = `${this.newContent}${q} \n\n`;
+    }
     if (!this.currentPageIsLastPage) {
       await this.transitionToRoute({
         queryParams: { page: this.model.postsPaged.meta.totalPages },
@@ -69,6 +72,16 @@ export default class PostsIndexController extends Controller {
     }
   }
 
+  @action
+  updateNewContent(newContent) {
+    this.newContent = newContent;
+  }
+
+  @action
+  resetNewContent() {
+    this.newContent = '';
+  }
+
   @action
   goToPreviousPage() {
     return this.advanceToPage(-1);

diff --git a/app/routes/forum/categories/category/threads/thread/posts/index.js b/app/routes/forum/categories/category/threads/thread/posts/index.js
@@ -68,6 +68,13 @@ export default class PostIndexRoute extends AuthenticatedRoute {
     this.controller.send('goToNextPage');
   }
 
+  resetController(controller, isExiting, transition) {
+    super.resetController(controller, isExiting, transition);
+    if (isExiting) {
+      controller.send('resetNewContent');
+    }
+  }
+
   constructor() {
     super(...arguments);
 

diff --git a/app/templates/forum/categories/category/threads/thread/posts/index.hbs b/app/templates/forum/categories/category/threads/thread/posts/index.hbs
@@ -38,8 +38,9 @@
       <div class='card-body'>
         <Forum::ForumPostNew
           @thread={{@model}}
-          @content={{newContent}}
-          @onSubmit={{action 'newPostCreated'}}
+          @content={{this.newContent}}
+          @updateContent={{this.updateNewContent}}
+          @onSubmit={{this.newPostCreated}}
         />
       </div>
     </div>