Communication: Remove hidden conversations from favorites

src/main/webapp/app/shared/sidebar/conversation-options/conversation-options.component.ts

@@ -79,11 +79,35 @@ export class ConversationOptionsComponent implements OnInit, OnDestroy {
 
     onHiddenClicked(event: MouseEvent) {
         event.stopPropagation();
+        if (!this.course.id || !this.conversation.id) {
+            return;
+        }
+
+        if (!this.conversation.isHidden && this.conversation.isFavorite) {
+            this.conversationService.updateIsFavorite(this.course.id, this.conversation.id, false).subscribe({
+                next: () => {
+                    this.conversation.isFavorite = false;
+                },
+                error: (errorResponse: HttpErrorResponse) => onError(this.alertService, errorResponse),
+            });
+        }
         this.hide$.next(!this.conversation.isHidden);
     }
 
     onFavoriteClicked($event: MouseEvent) {
         $event.stopPropagation();
+        if (!this.course.id || !this.conversation.id) {
+            return;
+        }
+
+        if (this.conversation.isHidden && !this.conversation.isFavorite) {
+            this.conversationService.updateIsHidden(this.course.id, this.conversation.id, false).subscribe({
+                next: () => {
+                    this.conversation.isHidden = false;
+                },
+                error: (errorResponse: HttpErrorResponse) => onError(this.alertService, errorResponse),
+            });
+        }
         this.favorite$.next(!this.conversation.isFavorite);
     }
 

src/test/javascript/spec/component/shared/sidebar/conversation-options.component.spec.ts

@@ -85,6 +85,43 @@ examples.forEach((conversation) => {
             expect(component).toBeTruthy();
         });
 
+        it('should remove conversation from favorites when hidden', fakeAsync(() => {
+            component.conversation.isFavorite = true;
+            component.conversation.isHidden = false;
+
+            const hideButton = fixture.debugElement.nativeElement.querySelector('.hide');
+            hideButton.click();
+            tick(501);
+
+            expect(updateIsFavoriteSpy).toHaveBeenCalledOnce();
+            expect(updateIsFavoriteSpy).toHaveBeenCalledWith(course.id, component.conversation.id, false);
+
+            expect(updateIsHiddenSpy).toHaveBeenCalledOnce();
+            expect(updateIsHiddenSpy).toHaveBeenCalledWith(course.id, component.conversation.id, true);
+
+            expect(component.conversation.isFavorite).toBeFalse();
+            expect(component.conversation.isHidden).toBeTrue();
+        }));
+
+        it('should remove conversation from hidden when favorited', fakeAsync(() => {
+            component.conversation.isFavorite = false;
+            component.conversation.isHidden = true;
+            fixture.detectChanges();
+
+            const favoriteButton = fixture.debugElement.nativeElement.querySelector('.favorite');
+            favoriteButton.click();
+            tick(501);
+
+            expect(updateIsHiddenSpy).toHaveBeenCalledOnce();
+            expect(updateIsHiddenSpy).toHaveBeenCalledWith(course.id, component.conversation.id, false);
+
+            expect(updateIsFavoriteSpy).toHaveBeenCalledOnce();
+            expect(updateIsFavoriteSpy).toHaveBeenCalledWith(course.id, component.conversation.id, true);
+
+            expect(component.conversation.isHidden).toBeFalse();
+            expect(component.conversation.isFavorite).toBeTrue();
+        }));
+
         it('should call updateIsFavorite when button is clicked', fakeAsync(() => {
             const button = fixture.debugElement.nativeElement.querySelector('.favorite');
             button.click();