1. Fixed issue with Sorting

2. Added Edit Answer Functionality

Author: codingdefined

src/LetsDisc.Application/Posts/PostAppService.cs

@@ -206,19 +206,16 @@ public async Task<PagedResultDto<PostDto>> GetQuestions(PagedAndSortedResultRequ
                 questions = _postRepository
                                     .GetAll()
                                     .Include(a => a.CreatorUser)
-                                    .Where(a => a.PostTypeId == (int)PostTypes.Question && a.Tags.Contains(tag))
-                                    .Skip(input.SkipCount)
-                                    .Take(input.MaxResultCount);
+                                    .Where(a => a.PostTypeId == (int)PostTypes.Question && a.Tags.Contains(tag));
             }
             else
             {
                 questionCount = await _postRepository.CountAsync(p => p.PostTypeId == (int)PostTypes.Question);
                 questions = _postRepository
                                     .GetAll()
                                     .Include(a => a.CreatorUser)
-                                    .Where(a => a.PostTypeId == (int)PostTypes.Question)
-                                    .Skip(input.SkipCount)
-                                    .Take(input.MaxResultCount);
+                                    .Where(a => a.PostTypeId == (int)PostTypes.Question);
+                                    
             }
 
             switch (input.Sorting)
@@ -237,7 +234,10 @@ public async Task<PagedResultDto<PostDto>> GetQuestions(PagedAndSortedResultRequ
                     break;
             }
 
-            var questionList = await questions.ToListAsync();
+            var questionList = await questions
+                                    .Skip(input.SkipCount)
+                                    .Take(input.MaxResultCount)
+                                    .ToListAsync();
 
             return new PagedResultDto<PostDto>
             {
@@ -378,6 +378,24 @@ public async Task<PostWithVoteInfo> SubmitAnswer(SubmitAnswerInput input)
             };
         }
 
+        public async Task<PostWithVoteInfo> UpdateAnswer(PostDto input)
+        {
+            CheckUpdatePermission();
+
+            var post = await _postRepository.GetAsync(input.Id);
+            post.Body = input.Body;
+            post.LastModificationTime = DateTime.Now;
+
+            await _postRepository.UpdateAsync(post);
+
+            return new PostWithVoteInfo
+            {
+                Post = post.MapTo<PostDto>(),
+                Upvote = false,
+                Downvote = false
+            };
+        }
+
         protected override IQueryable<Post> ApplySorting(IQueryable<Post> query, PagedAndSortedResultRequestDto input)
         {
             return base.ApplySorting(query, input);

src/LetsDisc.Web.Host/src/app/posts/posts.component.ts

@@ -34,6 +34,8 @@ export class PostsComponent extends PagedListingComponentBase<PostDto>{
         }
     };
     searchString: string;
+    sortByValue: string;
+    defaultSortBy: string = 'newest';
 
     constructor(injector: Injector, private _postService: PostServiceProxy, private titleService: Title, private route: ActivatedRoute) {
         super(injector);
@@ -42,7 +44,8 @@ export class PostsComponent extends PagedListingComponentBase<PostDto>{
 
     ngOnChanges(changes: SimpleChanges) {
         if (changes['tagValue']) {
-            this._postService.getQuestions("newest", 0, 10, this.tagValue)
+            this.sortByValue = this.defaultSortBy;
+            this._postService.getQuestions(this.sortByValue, 0, 10, this.tagValue)
                 .subscribe((result: PagedResultDtoOfPostDto) => {
                     this.questions = result.items;
                     this.showPaging(result, 0);
@@ -53,7 +56,7 @@ export class PostsComponent extends PagedListingComponentBase<PostDto>{
 
     protected list(request: PagedRequestDto, pageNumber: number, finishedCallback: Function): void {
         this.route.queryParamMap.subscribe(urlParams => this.searchString = urlParams.get('q'));
-        this._postService.getQuestions(request.sorting, request.skipCount, request.maxResultCount, this.tagValue)
+        this._postService.getQuestions(this.sortByValue, request.skipCount, request.maxResultCount, this.tagValue)
             .pipe(finalize(() => {
                 finishedCallback()
             }))
@@ -79,6 +82,7 @@ export class PostsComponent extends PagedListingComponentBase<PostDto>{
     }
 
     public sortBy(value: string) {
+        this.sortByValue = value;
         this._postService.getQuestions(value, 0, 10, this.tagValue)
             .subscribe((result: PagedResultDtoOfPostDto) => {
                 this.questions = result.items;

src/LetsDisc.Web.Host/src/app/posts/question-detail/question-detail.component.html

@@ -92,7 +92,7 @@ <h3>
             <div class="all-answers">
                 <div class="answer-length"><h4 *ngIf="answers && answers.length > 0">{{answers.length | i18nPlural: itemPluralMapping['answer'] }}</h4></div>
                 <div class="answer" *ngFor="let answer of answers">
-                    <div class="answer-summary" id="answer-{{answer?.post.id}}">
+                    <div class="answer-summary" id="answer-{{answer?.post.id}}" [style.display]="currentAnswerEditing?.post.id !== answer?.post.id ? 'inherit' : 'none' ">
                         <div class="vote-layout">
                             <a class="vote-up" (click)="voteUp(answer?.post.id)">
                                 <i [class.voted]="answer?.upvote" class="material-icons md-48">arrow_drop_up</i>
@@ -102,9 +102,21 @@ <h3>
                                 <i [class.voted]="answer?.downvote" class="material-icons md-48">arrow_drop_down</i>
                             </a>
                         </div>
+                        <div class="post-menu float-right">
+                            <a class="edit-post" title="edit answer" *ngIf="this.appSession.isLoggedIn && answer && this.appSession.userId === answer.post.creatorUserId" (click)="editAnswerClicked(answer)">edit</a>
+                        </div>
                         <div class="answer-body" [innerHTML]="answer?.post.body"></div>
                         <div class="posted-time">answered {{answer?.post.creationTime | timeAgo}} by {{answer?.post.creatorUserName}}</div>
                     </div>
+                    <div class="edit-answer" [style.display]="answerEditing && currentAnswerEditing?.post.id === answer?.post.id ? 'inherit' : 'none'">
+                        <form #myform="ngForm" class="form answer-form" method="post">
+                            <div class="your-answer">
+                                <ckeditor id="answer-body" [(ngModel)]="currentAnswerEditing?.post.body" [editor]="Editor" [config]="config" name="Body" class="answer-body"></ckeditor>
+                                <button type="submit" class="btn btn-primary btn-save-edits" (click)="updateAnswer()">Save Edits</button>
+                                <button type="button" class="btn btn-default" (click)="answerCancelClick()">Cancel</button>
+                            </div>
+                        </form>
+                    </div>
                 </div>
             </div>
             <form #myform="ngForm" class="form answer-form" method="post" (ngSubmit)="saveAnswer()">

src/LetsDisc.Web.Host/src/app/posts/question-detail/question-detail.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Injector } from '@angular/core';
-import { PostDto, PostServiceProxy, VoteChangeOutput, PostWithVoteInfo, SubmitAnswerInput, PostWithAnswers } from '@shared/service-proxies/service-proxies';
+import { PostDto, PostServiceProxy, VoteChangeOutput, PostWithVoteInfo, SubmitAnswerInput, PostWithAnswers, IPostWithVoteInfo } from '@shared/service-proxies/service-proxies';
 import { AppComponentBase } from '@shared/app-component-base';
 import * as ClassicEditor from '@ckeditor/ckeditor5-build-classic';
 import { TagInputModule } from 'ngx-chips';
@@ -21,6 +21,8 @@ export class QuestionDetailComponent extends AppComponentBase implements OnInit
     id: number;
     items = [];
     editing: boolean = false;
+    answerEditing: boolean = false;
+    currentAnswerEditing: PostWithVoteInfo;
     saving: boolean = false;
     browerRefresh: boolean = false;
     public Editor = ClassicEditor;
@@ -130,11 +132,33 @@ export class QuestionDetailComponent extends AppComponentBase implements OnInit
         this.editing = true;
     }
 
+    editAnswerClicked(answer: PostWithVoteInfo): void {
+        this.answerEditing = true;
+        this.currentAnswerEditing = JSON.parse(JSON.stringify(answer));
+    }
+
     cancelClick(): void {
         this.editing = false;
         this.question = this.notEditedQuestion;
     }
 
+    answerCancelClick(): void {
+        this.answerEditing = false;
+        this.currentAnswerEditing = null;
+    }
+
+    updateAnswer(): void {
+        const index = this.answers.findIndex((item) => item.post.id == this.currentAnswerEditing.post.id);
+        this._postService.updateAnswer(this.currentAnswerEditing.post)
+            .subscribe((result: PostWithVoteInfo) => {
+                this.answers[index] = result;
+                this.answers = JSON.parse(JSON.stringify(this.answers));
+                this.notify.info('Answer Updated');
+                this.answerEditing = false;
+                this.currentAnswerEditing = null;
+            });
+    }
+
     saveQuestion(): void {
         let localItems = [];
         this.items.forEach(function (item) {

src/LetsDisc.Web.Host/src/app/search-posts/search-posts.component.ts

@@ -26,6 +26,7 @@ export class SearchPostsComponent extends PagedListingComponentBase<PostDto>{
         }
     };
     searchString: string;
+    sortByValue: string;
     defaultSortBy: string = 'newest';
 
     constructor(injector: Injector, private _postService: PostServiceProxy, private titleService: Title, private route: ActivatedRoute, private router: Router) {
@@ -35,7 +36,7 @@ export class SearchPostsComponent extends PagedListingComponentBase<PostDto>{
     protected list(request: PagedRequestDto, pageNumber: number, finishedCallback: Function): void {
         this.route.queryParamMap.subscribe(urlParams => this.searchString = urlParams.get('q'));
         if (this.searchString !== '') {
-            this._postService.getSearchPosts(request.sorting, request.skipCount, request.maxResultCount, this.searchString)
+            this._postService.getSearchPosts(this.sortByValue, request.skipCount, request.maxResultCount, this.searchString)
                 .pipe(finalize(() => {
                     finishedCallback()
                 }))
@@ -55,6 +56,7 @@ export class SearchPostsComponent extends PagedListingComponentBase<PostDto>{
     }
 
     public sortBy(value: string): void {
+        this.sortByValue = value;
         if (this.searchString !== '') {
             this._postService.getSearchPosts(value, 0, 10, this.searchString)
                 .subscribe((result: PagedResultDtoOfPostDto) => {
@@ -76,7 +78,7 @@ export class SearchPostsComponent extends PagedListingComponentBase<PostDto>{
                     queryParams: { q: this.searchString },
                     queryParamsHandling: 'merge'
                 });
-            this._postService.getSearchPosts(this.defaultSortBy, 0, 10, this.searchString)
+            this._postService.getSearchPosts(this.sortByValue, 0, 10, this.searchString)
                 .subscribe((result: PagedResultDtoOfPostDto) => {
                     this.posts = result.items;
                     this.showPaging(result, 0);

src/LetsDisc.Web.Host/src/app/tags/tags.component.ts

@@ -22,7 +22,7 @@ export class TagsComponent extends PagedListingComponentBase<TagDto> {
   }
 
     protected list(request: PagedRequestDto, pageNumber: number, finishedCallback: Function): void {
-        this._tagService.getTags(request.maxResultCount, request.skipCount)
+        this._tagService.getTags(request.skipCount, request.maxResultCount)
         .pipe(finalize(() => {
             finishedCallback()
         }))

src/LetsDisc.Web.Host/src/app/users/user-detail/user-detail.component.html

@@ -7,7 +7,7 @@
                     <div class="user-reputation">{{userDetails?.reputation}} Reputation</div>
                     <div class="user-questions"><strong>{{questionsCount}}</strong>{{questionsCount | i18nPlural: itemPluralMapping['question']}}</div>
                     <div class="user-answers"><strong>{{answersCount}}</strong>{{answersCount | i18nPlural: itemPluralMapping['answer']}}</div>
-                    <div class="user-views">{{userDetails?.views | i18nPlural: itemPluralMapping['view']}}</div>
+                    <div class="user-views">{{userDetails?.views | i18nPlural: itemPluralMapping['profileview']}}</div>
                     <div class="user-member-for">Member for {{ createdTimeAgo }}</div>
 
                 </div>

src/LetsDisc.Web.Host/src/app/users/user-detail/user-detail.component.ts

@@ -40,11 +40,16 @@ export class UserDetailComponent extends AppComponentBase implements OnInit {
             '=1': ' answer',
             'other': ' answers'
         },
-        'view': {
+        'profileview': {
             '=0': '0 profile views',
             '=1': '1 profile view',
             'other': '# profile views'
         },
+        'view': {
+            '=0': '0 views',
+            '=1': '1 view',
+            'other': '# views'
+        },
         'question': {
             '=0': ' questions',
             '=1': ' question',
@@ -96,7 +101,7 @@ export class UserDetailComponent extends AppComponentBase implements OnInit {
     }
 
     protected questionList(userId: number, request: PagedRequestDto, pageNumber: number, finishedCallback: Function): void {
-        this._userService.getUserQuestions(request.maxResultCount, request.skipCount, userId)
+        this._userService.getUserQuestions(request.skipCount, request.maxResultCount, userId)
             .pipe(finalize(() => {
                 finishedCallback()
             }))
@@ -107,7 +112,7 @@ export class UserDetailComponent extends AppComponentBase implements OnInit {
     }
 
     protected answerList(userId: number, request: PagedRequestDto, pageNumber: number, finishedCallback: Function): void {
-        this._userService.getUserAnswers(request.maxResultCount, request.skipCount, userId)
+        this._userService.getUserAnswers(request.skipCount, request.maxResultCount, userId)
             .pipe(finalize(() => {
                 finishedCallback()
             }))

src/LetsDisc.Web.Host/src/app/users/users.component.ts

@@ -29,7 +29,7 @@ export class UsersComponent extends PagedListingComponentBase<UserDto> {
     }
 
     protected list(request: PagedRequestDto, pageNumber: number, finishedCallback: Function): void {
-        this._userService.getALLUsers(request.maxResultCount, request.skipCount)
+        this._userService.getALLUsers(request.skipCount, request.maxResultCount)
             .pipe(finalize(() => {
                  finishedCallback()
             }))