Communication: Prevent post submission if already in progress (#7130)

ls1intum · Sep 16, 2023 · 9567be4 · 9567be4
1 parent 927308a
commit 9567be4
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 11 deletions.
diff --git a/.../webapp/app/shared/metis/message/message-inline-input/message-inline-input.component.html b/.../webapp/app/shared/metis/message/message-inline-input/message-inline-input.component.html
@@ -17,7 +17,7 @@ <h4 class="alert-heading">{{ 'artemisApp.messageWarning.headerText' | artemisTra
                 <p class="mb-0">{{ 'artemisApp.messageWarning.lastParagraph' | artemisTranslate }}</p>
             </div>
             <button
-                *ngIf="editType == EditType.UPDATE"
+                *ngIf="editType === EditType.UPDATE"
                 jhi-posting-button
                 [buttonLabel]="'artemisApp.metis.cancel' | artemisTranslate"
                 class="btn btn-sm btn-outline-secondary"
@@ -26,7 +26,7 @@ <h4 class="alert-heading">{{ 'artemisApp.messageWarning.headerText' | artemisTra
             <button
                 jhi-posting-button
                 [buttonLoading]="isLoading"
-                [disabled]="!formGroup.valid"
+                [disabled]="isLoading || !formGroup.valid"
                 [buttonLabel]="'artemisApp.conversationsLayout.sendMessage' | artemisTranslate"
                 class="btn btn-sm btn-outline-secondary"
                 id="save"

diff --git a/...in/webapp/app/shared/metis/message/message-inline-input/message-inline-input.component.ts b/...in/webapp/app/shared/metis/message/message-inline-input/message-inline-input.component.ts
@@ -16,6 +16,7 @@ import { LocalStorageService } from 'ngx-webstorage';
 })
 export class MessageInlineInputComponent extends PostingCreateEditDirective<Post | AnswerPost> implements OnInit {
     warningDismissed = false;
+
     constructor(
         protected metisService: MetisService,
         protected modalService: NgbModal,
@@ -57,6 +58,10 @@ export class MessageInlineInputComponent extends PostingCreateEditDirective<Post
         });
     }
 
+    /**
+     * invokes the metis service with the updated answer post
+     * ends the process successfully by closing the modal and stopping the button's loading animation
+     */
     updatePosting(): void {
         this.posting.content = this.formGroup.get('content')?.value;
         this.metisService.updatePost(this.posting).subscribe({

diff --git a/...shared/metis/message/message-reply-inline-input/message-reply-inline-input.component.html b/...shared/metis/message/message-reply-inline-input/message-reply-inline-input.component.html
@@ -17,7 +17,7 @@ <h4 class="alert-heading">{{ 'artemisApp.messageWarning.headerText' | artemisTra
                 <p class="mb-0">{{ 'artemisApp.messageWarning.lastParagraph' | artemisTranslate }}</p>
             </div>
             <button
-                *ngIf="editType == EditType.UPDATE"
+                *ngIf="editType === EditType.UPDATE"
                 jhi-posting-button
                 [buttonLabel]="'artemisApp.metis.cancel' | artemisTranslate"
                 class="btn btn-sm btn-outline-secondary"
@@ -26,9 +26,10 @@ <h4 class="alert-heading">{{ 'artemisApp.messageWarning.headerText' | artemisTra
             <button
                 jhi-posting-button
                 [buttonLoading]="isLoading"
-                [disabled]="!formGroup.valid"
+                [disabled]="isLoading || !formGroup.valid"
                 [buttonLabel]="'artemisApp.conversationsLayout.sendMessage' | artemisTranslate"
                 class="btn btn-sm btn-outline-secondary"
+                id="save"
                 type="submit"
             ></button>
         </div>

diff --git a/...p/shared/metis/message/message-reply-inline-input/message-reply-inline-input.component.ts b/...p/shared/metis/message/message-reply-inline-input/message-reply-inline-input.component.ts
@@ -16,11 +16,6 @@ import { LocalStorageService } from 'ngx-webstorage';
 export class MessageReplyInlineInputComponent extends PostingCreateEditDirective<AnswerPost> implements OnInit {
     warningDismissed = false;
 
-    ngOnInit(): void {
-        super.ngOnInit();
-        this.warningDismissed = !!this.localStorageService.retrieve('chatWarningDismissed');
-    }
-
     constructor(
         protected metisService: MetisService,
         protected modalService: NgbModal,
@@ -30,6 +25,11 @@ export class MessageReplyInlineInputComponent extends PostingCreateEditDirective
         super(metisService, modalService, formBuilder);
     }
 
+    ngOnInit(): void {
+        super.ngOnInit();
+        this.warningDismissed = !!this.localStorageService.retrieve('chatWarningDismissed');
+    }
+
     /**
      * resets the answer post content
      */

diff --git a/...ate-edit-modal/answer-post-create-edit-modal/answer-post-create-edit-modal.component.html b/...ate-edit-modal/answer-post-create-edit-modal/answer-post-create-edit-modal.component.html
@@ -8,7 +8,7 @@
                 <button
                     jhi-posting-button
                     [buttonLoading]="isLoading"
-                    [disabled]="!formGroup.valid"
+                    [disabled]="isLoading || !formGroup.valid"
                     [buttonLabel]="'artemisApp.metis.savePosting' | artemisTranslate"
                     id="save"
                     class="btn btn-sm btn-outline-secondary"

diff --git a/...is/posting-create-edit-modal/post-create-edit-modal/post-create-edit-modal.component.html b/...is/posting-create-edit-modal/post-create-edit-modal/post-create-edit-modal.component.html
@@ -115,7 +115,7 @@ <h4 class="modal-title">{{ modalTitle | artemisTranslate }}</h4>
             <button
                 jhi-posting-button
                 [buttonLoading]="isLoading"
-                [disabled]="!formGroup.valid"
+                [disabled]="isLoading || !formGroup.valid"
                 [buttonLabel]="'artemisApp.metis.savePosting' | artemisTranslate"
                 id="save"
                 class="btn btn-sm btn-outline-secondary"

diff --git a/src/main/webapp/app/shared/metis/posting-create-edit.directive.ts b/src/main/webapp/app/shared/metis/posting-create-edit.directive.ts
@@ -53,6 +53,7 @@ export abstract class PostingCreateEditDirective<T extends Posting> implements O
      * set the input content (updated or new; of post and answer post) delegates to the corresponding method
      */
     confirm(): void {
+        if (this.isLoading) return;
         if (this.formGroup.valid) {
             this.isLoading = true;
             if (this.editType === PostingEditType.UPDATE) {