Changeset e071d30 for src/Clients

Timestamp:

11/09/21 17:07:49 (3 years ago)

Author:

Стојков Марко <mst@…>

Branches:

dev

Children:

fcc3080

Parents:

53bebc0 (diff), 6165fd0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged feature/delete-answer-and-answer-response into dev

Location:

src/Clients/Angular/finki-chattery/src

Files:

• app/core/services/student-question.service.ts (modified) (1 diff)
• app/core/state/question-facade.service.ts (modified) (2 diffs)
• app/core/state/question-state/question.actions.ts (modified) (2 diffs)
• app/core/state/question-state/question.effects.ts (modified) (2 diffs)
• app/core/state/question-state/question.reducers.ts (modified) (1 diff)
• app/shared-app/components/components.ts (modified) (2 diffs)
• app/shared-app/components/generic/delete-confirm-dialog/delete-confirm-dialog.component.html (added)
• app/shared-app/components/generic/delete-confirm-dialog/delete-confirm-dialog.component.scss (added)
• app/shared-app/components/generic/delete-confirm-dialog/delete-confirm-dialog.component.spec.ts (added)
• app/shared-app/components/generic/delete-confirm-dialog/delete-confirm-dialog.component.ts (added)
• app/shared-app/components/question/question-preview/question-preview.component.html (modified) (2 diffs)
• app/shared-app/components/question/question-preview/question-preview.component.ts (modified) (1 diff)
• app/shared-app/services/shared-dialog.service.ts (modified) (2 diffs)
• assets/translations/en.json (modified) (1 diff)

src/Clients/Angular/finki-chattery/src/app/core/services/student-question.service.ts

@@ -16 +16 @@
     return this.auth.selfUser?.student?.uid === answerResponse.student.uid;
   }
+
+  currentUserCanDeleteAnswer(answer: AnswerQuestionStateViewModel): boolean {
+    return this.auth.selfUser?.student?.uid === answer.student.uid;
+  }
+
+  currentUserCanNotDeleteAnswerBecauseMarkedCorrectEvenThoughHeIsTheAuthor(answer: AnswerQuestionStateViewModel): boolean {
+    return this.auth.selfUser?.student?.uid === answer.student.uid && answer.correctAnswer;
+  }
+
+  currentUserCanDeleteAnswerResponse(answerResponse: AnswerResponseQuestionStateViewModel): boolean {
+    return this.auth.selfUser?.student?.uid === answerResponse.student.uid;
+  }
 }

src/Clients/Angular/finki-chattery/src/app/core/state/question-facade.service.ts

@@ -15 +15 @@
 import {
   AnswerQuestion,
+  DeleteAnswer,
+  DeleteAnswerResponse,
   EditAnswerQuestion,
   EditAnswerResponse,
@@ -101 +103 @@
   }
 
+  public deleteAnswerResponse(answerUid: string, questionUid: string, answerResponseUid: string): void {
+    this.dispatchEffect(new DeleteAnswerResponse(questionUid, answerUid, answerResponseUid));
+  }
+
+  public deleteAnswer(answerUid: string, questionUid: string): void {
+    this.dispatchEffect(new DeleteAnswer(questionUid, answerUid));
+  }
+
   public fetchQuestion(questionUid: string): void {
     this.dispatchEffect(new GetQuestionState(questionUid));

src/Clients/Angular/finki-chattery/src/app/core/state/question-state/question.actions.ts

@@ -33 +33 @@
   EditAnswerResponse = '[Question] EditAnswerResponse',
   EditAnswerResponseSuccess = '[Question] EditAnswerResponse Success',
+  DeleteAnswer = '[Question] DeleteAnswer',
+  DeleteAnswerSuccess = '[Question] DeleteAnswer Success',
+  DeleteAnswerResponse = '[Question] DeleteAnswerResponse',
+  DeleteAnswerResponseSuccess = '[Question] DeleteAnswerResponse Success',
   EffectStartedWorking = '[Question] Effect Started Working',
   EffectFinishedWorking = '[Question] Effect Finished Working',
   EffectFinishedWorkingError = '[Question] Effect Finished Working error'
+}
+
+export class DeleteAnswer implements Action {
+  readonly type = QuestionActionTypes.DeleteAnswer;
+
+  constructor(public questionUid: string, public answerUid: string) {}
+}
+
+export class DeleteAnswerSuccess implements Action {
+  readonly type = QuestionActionTypes.DeleteAnswerSuccess;
+
+  constructor(public payload: string) {}
+}
+
+export class DeleteAnswerResponse implements Action {
+  readonly type = QuestionActionTypes.DeleteAnswerResponse;
+
+  constructor(public questionUid: string, public answerUid: string, public answerResponseUid: string) {}
+}
+
+export class DeleteAnswerResponseSuccess implements Action {
+  readonly type = QuestionActionTypes.DeleteAnswerResponseSuccess;
+
+  constructor(public payload: string, public answerUid: string) {}
 }
 
@@ -187 +215 @@
   | EditAnswerQuestionSuccess
   | EditAnswerResponseSuccess
+  | DeleteAnswerSuccess
+  | DeleteAnswerResponseSuccess
   | EffectStartedWorking
   | EffectFinishedWorking

src/Clients/Angular/finki-chattery/src/app/core/state/question-state/question.effects.ts

@@ -19 +19 @@
   AnswerQuestion,
   AnswerQuestionSuccess,
+  DeleteAnswer,
+  DeleteAnswerResponse,
+  DeleteAnswerResponseSuccess,
+  DeleteAnswerSuccess,
   EditAnswerQuestion,
   EditAnswerQuestionSuccess,
@@ -236 +240 @@
     );
   });
+
+  deleteResponseToAnswer$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType<DeleteAnswerResponse>(QuestionActionTypes.DeleteAnswerResponse),
+      mergeMap((action) => {
+        return this.api
+          .delete<string>(`v1/questions/${action.questionUid}/answers/${action.answerUid}/answerresponses/${action.answerResponseUid}`)
+          .pipe(
+            tap((state) => this.notification.successNotification('success-delete-answer-response')),
+            switchMap((state) => [new DeleteAnswerResponseSuccess(state, action.answerUid), new EffectFinishedWorking()]),
+            catchError((err) => [new EffectFinishedWorkingError(err)])
+          );
+      })
+    );
+  });
+
+  deleteAnswer$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType<DeleteAnswer>(QuestionActionTypes.DeleteAnswer),
+      mergeMap((action) => {
+        return this.api.delete<string>(`v1/questions/${action.questionUid}/answers/${action.answerUid}`).pipe(
+          tap((state) => this.notification.successNotification('success-delete-answer')),
+          switchMap((state) => [new DeleteAnswerSuccess(state), new EffectFinishedWorking()]),
+          catchError((err) => [new EffectFinishedWorkingError(err)])
+        );
+      })
+    );
+  });
 }

src/Clients/Angular/finki-chattery/src/app/core/state/question-state/question.reducers.ts

@@ -162 +162 @@
       };
     }
+    case QuestionActionTypes.DeleteAnswerSuccess: {
+      if (state.question) {
+        return {
+          ...state,
+          question: {
+            ...state.question,
+            answers: state.question.answers.filter((x) => x.uid !== action.payload)
+          }
+        };
+      }
+
+      return {
+        ...state
+      };
+    }
+    case QuestionActionTypes.DeleteAnswerResponseSuccess: {
+      if (state.question) {
+        return {
+          ...state,
+          question: {
+            ...state.question,
+            answers: state.question.answers.map((x) => {
+              if (x.uid === action.answerUid) {
+                return {
+                  ...x,
+                  answerResponses: x.answerResponses.filter((y) => y.uid !== action.payload)
+                };
+              }
+
+              return x;
+            })
+          }
+        };
+      }
+
+      return {
+        ...state
+      };
+    }
     case QuestionActionTypes.AnswerQuestionSuccess: {
       if (state.question) {

src/Clients/Angular/finki-chattery/src/app/shared-app/components/components.ts

@@ -1 +1 @@
 import { ButtonComponent } from './generic/button/button.component';
+import { DeleteConfirmDialogComponent } from './generic/delete-confirm-dialog/delete-confirm-dialog.component';
 import { FileUploadComponent } from './generic/file-upload/file-upload.component';
 import { FormErrorComponent } from './generic/form-error/form-error.component';
@@ -32 +33 @@
   AnswerQuestionComponent,
   EditAnswerDialogComponent,
-  EditAnswerResponseDialogComponent
+  EditAnswerResponseDialogComponent,
+  DeleteConfirmDialogComponent
 ];

src/Clients/Angular/finki-chattery/src/app/shared-app/components/question/question-preview/question-preview.component.html

@@ -48 +48 @@
               {{ answerResponse.createdOn | momentDate: 'LL' }}
               <span
-                class="cursor text-bold"
+                class="cursor text-bold padding-right-sm"
                 *ngIf="studentQuestion.currentUserCanEditAnswerResponse(answerResponse)"
                 (click)="editAnswerResponse(question.uid, answer.uid, answerResponse.uid, answerResponse.text)"
                 >{{ 'question-preview-edit-answer-response' | translate }}</span
+              >
+              <span
+                class="cursor text-bold"
+                *ngIf="studentQuestion.currentUserCanDeleteAnswerResponse(answerResponse)"
+                (click)="deleteAnswerResponse(question.uid, answer.uid, answerResponse.uid)"
+                >{{ 'delete-button' | translate }}</span
               >
               <hr />
@@ -68 +74 @@
           >{{ 'question-preview-edit-answer' | translate }}</app-button
         >
+        <app-button
+          *ngIf="studentQuestion.currentUserCanDeleteAnswer(answer)"
+          [disabled]="studentQuestion.currentUserCanNotDeleteAnswerBecauseMarkedCorrectEvenThoughHeIsTheAuthor(answer)"
+          matTooltip="{{ 'question-preview-can-not-delete-because-marked-correct' | translate }}"
+          [matTooltipDisabled]="!studentQuestion.currentUserCanNotDeleteAnswerBecauseMarkedCorrectEvenThoughHeIsTheAuthor(answer)"
+          (action)="deleteAnswer(question.uid, answer.uid)"
+          [buttonType]="ButtonType.Basic"
+          >{{ 'delete-button' | translate }}</app-button
+        >
       </mat-card-actions>
     </mat-card>

src/Clients/Angular/finki-chattery/src/app/shared-app/components/question/question-preview/question-preview.component.ts

@@ -58 +58 @@
     this.dialog.editResponseToAnswer(questionUid, answerUid, answerResponseUid, text);
   }
+
+  deleteAnswer(questionUid: string, answerUid: string): void {
+    this.dialog.confirmDelete().subscribe((canDelete) => {
+      if (canDelete) {
+        this.questionFacade.deleteAnswer(answerUid, questionUid);
+      }
+    });
+  }
+
+  deleteAnswerResponse(questionUid: string, answerUid: string, answerResponseUid: string): void {
+    this.dialog.confirmDelete().subscribe((canDelete) => {
+      if (canDelete) {
+        this.questionFacade.deleteAnswerResponse(answerUid, questionUid, answerResponseUid);
+      }
+    });
+  }
 }

src/Clients/Angular/finki-chattery/src/app/shared-app/services/shared-dialog.service.ts

@@ -2 +2 @@
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { Observable } from 'rxjs';
+import { DeleteConfirmDialogComponent } from '../components/generic/delete-confirm-dialog/delete-confirm-dialog.component';
 import { EditAnswerDialogComponent } from '../components/question/edit-answer-dialog/edit-answer-dialog.component';
 // tslint:disable-next-line: max-line-length
@@ -54 +55 @@
     return dialogRef.afterClosed();
   }
+
+  public confirmDelete(title?: string): Observable<any> {
+    let dialogRef: MatDialogRef<DeleteConfirmDialogComponent>;
+    dialogRef = this.dialog.open(DeleteConfirmDialogComponent, {
+      width: '650px',
+      height: 'auto'
+    });
+
+    if (title) {
+      dialogRef.componentInstance.title = title;
+    }
+
+    return dialogRef.afterClosed();
+  }
 }

src/Clients/Angular/finki-chattery/src/assets/translations/en.json

@@ -73 +73 @@
   "question-preview-edit-answer": "Edit answer",
   "question-preview-edit-answer-response": "Edit response",
+  "success-delete-answer-response": "Successfully deleted answer response",
+  "success-delete-answer": "Successfully deleted answer",
+  "delete-button": "Delete",
+  "delete-basic-title": "Are you sure you want to delete this?",
+  "question-preview-can-not-delete-because-marked-correct": "Even though you are the author of the answer, it can not be deleted because it's marked as correct by the user who asked the question",
   "StudentDoesNotOwnQuestion": "You do not own this question",
   "AnswerAlreadyUpvoted": "You have already upvoted this answer",