refactor

ls1intum · Sep 23, 2024 · 8a1d9b3 · 8a1d9b3
1 parent 5e0990e
commit 8a1d9b3
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 52 deletions.
diff --git a/...urse-conversations/dialogs/channels-overview-dialog/channels-overview-dialog.component.ts b/...urse-conversations/dialogs/channels-overview-dialog/channels-overview-dialog.component.ts
@@ -1,7 +1,6 @@
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { Observable, Subject, debounceTime, distinctUntilChanged, finalize, map, takeUntil } from 'rxjs';
 import { faChevronRight } from '@fortawesome/free-solid-svg-icons';
-
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { onError } from 'app/shared/util/global.utils';
 import { AlertService } from 'app/core/util/alert.service';

diff --git a/...onversation-detail-dialog/tabs/conversation-settings/conversation-settings.component.html b/...onversation-detail-dialog/tabs/conversation-settings/conversation-settings.component.html
@@ -46,7 +46,7 @@
                                 (delete)="deleteChannel()"
                                 [dialogError]="dialogError$"
                             >
-                                <fa-icon [icon]="faTimes" />
+                                <fa-icon [icon]="faTrash" />
                             </button>
                         </div>
                     }

diff --git a/.../conversation-detail-dialog/tabs/conversation-settings/conversation-settings.component.ts b/.../conversation-detail-dialog/tabs/conversation-settings/conversation-settings.component.ts
@@ -42,7 +42,7 @@ export class ConversationSettingsComponent implements OnInit, OnDestroy {
     private dialogErrorSource = new Subject<string>();
     dialogError$ = this.dialogErrorSource.asObservable();
 
-    readonly faTimes = faTrash;
+    readonly faTrash = faTrash;
 
     conversationAsChannel: ChannelDTO | undefined;
     canLeaveConversation: boolean;

diff --git a/src/main/webapp/app/shared/sidebar/sidebar-card-item/sidebar-card-item.component.html b/src/main/webapp/app/shared/sidebar/sidebar-card-item/sidebar-card-item.component.html
@@ -51,7 +51,7 @@
                     @if (sidebarItem.icon) {
                         <fa-icon [fixedWidth]="true" [icon]="sidebarItem.icon" />
                     }
-                    {{ removeChannelPrefix(sidebarItem, sidebarItem.title) }}</span
+                    {{ removeChannelPrefix(sidebarItem.title) }}</span
                 >
                 <span>
                     @if (sidebarItem.rightIcon) {

diff --git a/src/main/webapp/app/shared/sidebar/sidebar-card-item/sidebar-card-item.component.ts b/src/main/webapp/app/shared/sidebar/sidebar-card-item/sidebar-card-item.component.ts
@@ -11,7 +11,7 @@ export class SidebarCardItemComponent {
     @Input() sidebarType?: SidebarTypes;
     @Input() groupKey?: string;
 
-    removeChannelPrefix(item: SidebarCardElement, name: string): string {
+    removeChannelPrefix(name: string): string {
         const prefixes = ['exercise-', 'lecture-', 'exam-'];
         const channelTypes = ['exerciseChannels', 'lectureChannels', 'examChannels'];
         for (const prefix of prefixes) {

diff --git a/src/main/webapp/app/shared/sidebar/sidebar.component.scss b/src/main/webapp/app/shared/sidebar/sidebar.component.scss
@@ -57,7 +57,6 @@
 
 .btn-primary {
     width: 100%;
-    box-sizing: border-box;
 }
 
 .btn {

diff --git a/...conversations/dialogs/channels-overview-dialog/channels-overview-dialog.component.spec.ts b/...conversations/dialogs/channels-overview-dialog/channels-overview-dialog.component.spec.ts
@@ -12,11 +12,9 @@ import { generateExampleChannelDTO } from '../../helpers/conversationExampleMode
 import { ChannelService } from 'app/shared/metis/conversations/channel.service';
 import { ConversationService } from 'app/shared/metis/conversations/conversation.service';
 import { AlertService } from 'app/core/util/alert.service';
-import { NgbActiveModal, NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { HttpResponse } from '@angular/common/http';
 import { By } from '@angular/platform-browser';
-import { ChannelsCreateDialogComponent } from 'app/overview/course-conversations/dialogs/channels-create-dialog/channels-create-dialog.component';
-import { defaultSecondLayerDialogOptions } from 'app/overview/course-conversations/other/conversation.util';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { NgbCollapseMocksModule } from '../../../../../helpers/mocks/directive/ngbCollapseMocks.module';
 
@@ -107,8 +105,7 @@ examples.forEach((exampleChannel) => {
             expect(component).toBeTruthy();
             expect(getChannelsOfCourseSpy).toHaveBeenCalledWith(course.id);
             expect(getChannelsOfCourseSpy).toHaveBeenCalledOnce();
-            expect(component.noOfChannels).toBe(3);
-            expect(component.otherChannels).toHaveLength(3);
+            expect(component.noOfChannels).toBe(6);
             expect(fixture.nativeElement.querySelectorAll('jhi-channel-item')).toHaveLength(6);
             expect(channelItems).toHaveLength(6);
             expect(channelItems[0].channel).toEqual(channelOne);
@@ -156,46 +153,5 @@ examples.forEach((exampleChannel) => {
                 expect(component.channelModificationPerformed).toBeTrue();
             }));
         }
-
-        it('should not show create channel button if user is missing the permission', fakeAsync(() => {
-            canCreateChannel.mockReturnValue(false);
-            fixture.detectChanges();
-            expect(fixture.debugElement.nativeElement.querySelector('#createChannel')).toBeFalsy();
-        }));
-
-        if (allowChannelCreation) {
-            it('should open create channel dialog when button is pressed', fakeAsync(() => {
-                const modalService = TestBed.inject(NgbModal);
-                const mockModalRef = {
-                    componentInstance: { course: undefined, initialize: () => {} },
-                    result: Promise.resolve(new ChannelDTO()),
-                };
-                const openDialogSpy = jest.spyOn(modalService, 'open').mockReturnValue(mockModalRef as unknown as NgbModalRef);
-                fixture.detectChanges();
-
-                const createChannelButton = fixture.debugElement.nativeElement.querySelector('#createChannel');
-                createChannelButton.click();
-                tick(501);
-                fixture.whenStable().then(() => {
-                    expect(openDialogSpy).toHaveBeenCalledOnce();
-                    expect(openDialogSpy).toHaveBeenCalledWith(ChannelsCreateDialogComponent, defaultSecondLayerDialogOptions);
-                    expect(mockModalRef.componentInstance.course).toEqual(course);
-                });
-            }));
-        } else {
-            it('should hide create channel button if creation is not allowed', () => {
-                const createChannelButton = fixture.debugElement.nativeElement.querySelector('#createChannel');
-                expect(createChannelButton).toBeNull();
-            });
-        }
-
-        it('should toggle other channels on click', () => {
-            expect(component.otherChannelsAreCollapsed).toBeTrue();
-
-            const otherChannels = fixture.debugElement.nativeElement.querySelector('.other-channels');
-            otherChannels.click();
-
-            expect(component.otherChannelsAreCollapsed).toBeFalse();
-        });
     });
 });