Communication: Improve sidebar user interface design

src/main/webapp/app/overview/course-conversations/course-conversations.component.html

@@ -29,10 +29,14 @@
                     [itemSelected]="conversationSelected"
                     [courseId]="course.id"
                     [sidebarData]="sidebarData"
-                    (onPlusPressed)="onAccordionPlusButtonPressed($event)"
+                    (onCreateChannelPressed)="onCreateChannelPressed()"
+                    (onBrowsePressed)="onBrowseChannelPressed()"
+                    (onDirectChatPressed)="onCreateDirectChatPressed()"
+                    (onGroupChatPressed)="onCreateGroupChatPressed()"
                     [showAddOption]="CHANNEL_TYPE_SHOW_ADD_OPTION"
                     [channelTypeIcon]="CHANNEL_TYPE_ICON"
                     [collapseState]="DEFAULT_COLLAPSE_STATE"
+                    [inCommunication]="true"
                 />
             </div>
             @if (course && !activeConversation && isCodeOfConductPresented) {

src/main/webapp/app/overview/course-conversations/course-conversations.component.ts

@@ -3,10 +3,10 @@ import { ConversationDTO } from 'app/entities/metis/conversation/conversation.mo
 import { Post } from 'app/entities/metis/post.model';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { EMPTY, Subject, Subscription, from, take, takeUntil } from 'rxjs';
-import { catchError } from 'rxjs/operators';
+import { EMPTY, Observable, Subject, Subscription, from, take, takeUntil } from 'rxjs';
+import { catchError, debounceTime, distinctUntilChanged } from 'rxjs/operators';
 import { MetisConversationService } from 'app/shared/metis/metis-conversation.service';
-import { ChannelSubType, getAsChannelDTO } from 'app/entities/metis/conversation/channel.model';
+import { ChannelDTO, ChannelSubType, getAsChannelDTO } from 'app/entities/metis/conversation/channel.model';
 import { MetisService } from 'app/shared/metis/metis.service';
 import { Course, isMessagingEnabled } from 'app/entities/course.model';
 import { PageType, SortDirection } from 'app/shared/metis/metis.util';
@@ -16,11 +16,12 @@ import { CourseWideSearchComponent, CourseWideSearchConfig } from 'app/overview/
 import { AccordionGroups, ChannelAccordionShowAdd, ChannelTypeIcons, CollapseState, SidebarCardElement, SidebarData } from 'app/types/sidebar';
 import { CourseOverviewService } from 'app/overview/course-overview.service';
 import { GroupChatCreateDialogComponent } from 'app/overview/course-conversations/dialogs/group-chat-create-dialog/group-chat-create-dialog.component';
-import { defaultFirstLayerDialogOptions } from 'app/overview/course-conversations/other/conversation.util';
+import { defaultFirstLayerDialogOptions, defaultSecondLayerDialogOptions } from 'app/overview/course-conversations/other/conversation.util';
 import { UserPublicInfoDTO } from 'app/core/user/user.model';
 import { OneToOneChatCreateDialogComponent } from 'app/overview/course-conversations/dialogs/one-to-one-chat-create-dialog/one-to-one-chat-create-dialog.component';
-import { ChannelsOverviewDialogComponent } from 'app/overview/course-conversations/dialogs/channels-overview-dialog/channels-overview-dialog.component';
+import { ChannelAction, ChannelsOverviewDialogComponent } from 'app/overview/course-conversations/dialogs/channels-overview-dialog/channels-overview-dialog.component';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
+import { ChannelsCreateDialogComponent } from 'app/overview/course-conversations/dialogs/channels-create-dialog/channels-create-dialog.component';
 
 const DEFAULT_CHANNEL_GROUPS: AccordionGroups = {
     favoriteChannels: { entityData: [] },
@@ -114,7 +115,9 @@ export class CourseConversationsComponent implements OnInit, OnDestroy {
     faFilter = faFilter;
     faSearch = faSearch;
 
-    // MetisConversationService is created in course overview, so we can use it here
+    createChannelFn?: (channel: ChannelDTO) => Observable<never>;
+    channelActions$ = new Subject<ChannelAction>();
+
     constructor(
         private router: Router,
         private activatedRoute: ActivatedRoute,
@@ -162,6 +165,16 @@ export class CourseConversationsComponent implements OnInit, OnDestroy {
                 this.metisConversationService.checkIsCodeOfConductAccepted(this.course!);
                 this.isServiceSetUp = true;
             }
+            this.channelActions$
+                .pipe(
+                    debounceTime(500),
+                    distinctUntilChanged((prev, curr) => prev.action === curr.action && prev.channel.id === curr.channel.id),
+                    takeUntil(this.ngUnsubscribe),
+                )
+                .subscribe((channelAction) => {
+                    this.performChannelAction(channelAction);
+                });
+            this.createChannelFn = (channel: ChannelDTO) => this.metisConversationService.createChannel(channel);
         });
 
         this.profileSubscription = this.profileService.getProfileInfo()?.subscribe((profileInfo) => {
@@ -170,6 +183,21 @@ export class CourseConversationsComponent implements OnInit, OnDestroy {
         });
     }
 
+    performChannelAction(channelAction: ChannelAction) {
+        if (this.createChannelFn) {
+            this.createChannelFn(channelAction.channel)
+                .pipe(takeUntil(this.ngUnsubscribe))
+                .subscribe({
+                    complete: () => {
+                        this.prepareSidebarData();
+                    },
+                    error: (error) => {
+                        console.error('Error creating channel:', error);
+                    },
+                });
+        }
+    }
+
     subscribeToQueryParameter() {
         this.activatedRoute.queryParams.pipe(take(1), takeUntil(this.ngUnsubscribe)).subscribe((queryParams) => {
             if (queryParams.conversationId) {
@@ -276,7 +304,6 @@ export class CourseConversationsComponent implements OnInit, OnDestroy {
             storageId: 'conversation',
             groupedData: this.accordionConversationGroups,
             ungroupedData: this.sidebarConversations,
-            showAccordionAddOption: true,
             showAccordionLeadingIcon: true,
         };
     }
@@ -290,14 +317,20 @@ export class CourseConversationsComponent implements OnInit, OnDestroy {
         this.courseOverviewService.setSidebarCollapseState('conversation', this.isCollapsed);
     }
 
-    onAccordionPlusButtonPressed(chatType: string) {
-        if (chatType === 'groupChats') {
-            this.openCreateGroupChatDialog();
-        } else if (chatType === 'directMessages') {
-            this.openCreateOneToOneChatDialog();
-        } else {
-            this.openChannelOverviewDialog(chatType);
-        }
+    onCreateChannelPressed() {
+        this.openCreateChannelDialog();
+    }
+
+    onCreateGroupChatPressed() {
+        this.openCreateGroupChatDialog();
+    }
+
+    onCreateDirectChatPressed() {
+        this.openCreateOneToOneChatDialog();
+    }
+
+    onBrowseChannelPressed() {
+        this.openChannelOverviewDialog();
     }
 
     openCreateGroupChatDialog() {
@@ -338,8 +371,22 @@ export class CourseConversationsComponent implements OnInit, OnDestroy {
             });
     }
 
-    openChannelOverviewDialog(groupKey: string) {
-        const subType = this.getChannelSubType(groupKey);
+    openCreateChannelDialog() {
+        const modalRef: NgbModalRef = this.modalService.open(ChannelsCreateDialogComponent, defaultSecondLayerDialogOptions);
+        modalRef.componentInstance.course = this.course;
+        modalRef.componentInstance.initialize();
+        from(modalRef.result)
+            .pipe(
+                catchError(() => EMPTY),
+                takeUntil(this.ngUnsubscribe),
+            )
+            .subscribe((channel: ChannelDTO) => {
+                this.channelActions$.next({ action: 'create', channel });
+            });
+    }
+
+    openChannelOverviewDialog() {
+        const subType = null;
         const modalRef: NgbModalRef = this.modalService.open(ChannelsOverviewDialogComponent, defaultFirstLayerDialogOptions);
         modalRef.componentInstance.course = this.course;
         modalRef.componentInstance.createChannelFn = subType === ChannelSubType.GENERAL ? this.metisConversationService.createChannel : undefined;
@@ -369,22 +416,6 @@ export class CourseConversationsComponent implements OnInit, OnDestroy {
             });
     }
 
-    getChannelSubType(groupKey: string) {
-        if (groupKey === 'exerciseChannels') {
-            return ChannelSubType.EXERCISE;
-        }
-        if (groupKey === 'generalChannels') {
-            return ChannelSubType.GENERAL;
-        }
-        if (groupKey === 'lectureChannels') {
-            return ChannelSubType.LECTURE;
-        }
-        if (groupKey === 'examChannels') {
-            return ChannelSubType.EXAM;
-        }
-        return ChannelSubType.GENERAL;
-    }
-
     toggleChannelSearch() {
         this.channelSearchCollapsed = !this.channelSearchCollapsed;
     }

src/main/webapp/app/overview/course-conversations/dialogs/channels-overview-dialog/channels-overview-dialog.component.html

@@ -3,7 +3,7 @@
         <div class="channels-overview">
             <div class="modal-header">
                 <h4 class="modal-title">
-                    <span>{{ 'artemisApp.dialogs.channelOverview.title.' + channelSubType | artemisTranslate: { courseTitle: course.title } }}</span>
+                    <span>{{ 'artemisApp.dialogs.channelOverview.title' | artemisTranslate: { courseTitle: course.title } }}</span>
                 </h4>
                 <button type="button" class="btn-close" (click)="clear()"></button>
             </div>
@@ -22,36 +22,6 @@ <h4 class="modal-title">
                         </div>
                     </div>
                 }
-                @if (otherChannels && otherChannels.length > 0) {
-                    <div class="form-group mt-4">
-                        <div (click)="otherChannelsAreCollapsed = !otherChannelsAreCollapsed" class="other-channels">
-                            <fa-icon [icon]="faChevronRight" [rotate]="!otherChannelsAreCollapsed ? 90 : undefined" />
-                            <span class="h5" jhiTranslate="artemisApp.dialogs.channelOverview.otherChannels"></span>
-                        </div>
-                        <div [(ngbCollapse)]="otherChannelsAreCollapsed">
-                            <div class="table-wrapper-scroll-y scrollbar mt-2">
-                                <ul class="list-group">
-                                    @for (channel of otherChannels; track otherChannels.indexOf(channel)) {
-                                        <li [id]="'channel-' + channel.id" class="list-group-item">
-                                            <jhi-channel-item [channel]="channel" (channelAction)="onChannelAction($event)" />
-                                        </li>
-                                    }
-                                </ul>
-                            </div>
-                        </div>
-                    </div>
-                }
-            </div>
-            <div class="modal-footer justify-content-between">
-                @if (createChannelFn && canCreateChannel(course)) {
-                    <button
-                        type="button"
-                        class="btn btn-secondary"
-                        (click)="openCreateChannelDialog($event)"
-                        id="createChannel"
-                        jhiTranslate="artemisApp.dialogs.channelOverview.createChannelButton"
-                    ></button>
-                }
             </div>
         </div>
     }

src/main/webapp/app/overview/course-conversations/dialogs/channels-overview-dialog/channels-overview-dialog.component.ts

@@ -1,19 +1,15 @@
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { EMPTY, Observable, Subject, debounceTime, distinctUntilChanged, finalize, from, map, takeUntil } from 'rxjs';
+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';
-import { NgbActiveModal, NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { ChannelService } from 'app/shared/metis/conversations/channel.service';
 import { ChannelDTO, ChannelSubType } from 'app/entities/metis/conversation/channel.model';
 import { Course } from 'app/entities/course.model';
-import { ChannelsCreateDialogComponent } from 'app/overview/course-conversations/dialogs/channels-create-dialog/channels-create-dialog.component';
 import { canCreateChannel } from 'app/shared/metis/conversations/conversation-permissions.utils';
 import { AbstractDialogComponent } from 'app/overview/course-conversations/dialogs/abstract-dialog.component';
-import { defaultSecondLayerDialogOptions } from 'app/overview/course-conversations/other/conversation.util';
-import { catchError } from 'rxjs/operators';
 
 export type ChannelActionType = 'register' | 'deregister' | 'view' | 'create';
 export type ChannelAction = {
@@ -44,12 +40,10 @@ export class ChannelsOverviewDialogComponent extends AbstractDialogComponent imp
     channelModificationPerformed = false;
     isLoading = false;
     channels: ChannelDTO[] = [];
-    otherChannels: ChannelDTO[] = [];
 
     isInitialized = false;
 
     faChevronRight = faChevronRight;
-    otherChannelsAreCollapsed = true;
 
     initialize() {
         super.initialize(['course', 'channelSubType']);
@@ -61,7 +55,6 @@ export class ChannelsOverviewDialogComponent extends AbstractDialogComponent imp
     constructor(
         private channelService: ChannelService,
         private alertService: AlertService,
-        private modalService: NgbModal,
 
         activeModal: NgbActiveModal,
     ) {
@@ -114,18 +107,6 @@ export class ChannelsOverviewDialogComponent extends AbstractDialogComponent imp
             case 'view':
                 this.close([channelAction.channel, this.channelModificationPerformed]);
                 break;
-            case 'create':
-                if (this.createChannelFn) {
-                    this.createChannelFn(channelAction.channel)
-                        .pipe(takeUntil(this.ngUnsubscribe))
-                        .subscribe({
-                            complete: () => {
-                                this.loadChannelsOfCourse();
-                                this.channelModificationPerformed = true;
-                            },
-                        });
-                }
-                break;
         }
     }
 
@@ -142,28 +123,12 @@ export class ChannelsOverviewDialogComponent extends AbstractDialogComponent imp
             )
             .subscribe({
                 next: (channels: ChannelDTO[]) => {
-                    this.channels = channels?.filter((channel) => channel.subType === this.channelSubType) ?? [];
-                    this.otherChannels = channels?.filter((channel) => channel.subType !== this.channelSubType) ?? [];
+                    this.channels = channels;
                     this.noOfChannels = this.channels.length;
                 },
                 error: (errorResponse: HttpErrorResponse) => {
                     onError(this.alertService, errorResponse);
                 },
             });
     }
-
-    openCreateChannelDialog(event: MouseEvent) {
-        event.stopPropagation();
-        const modalRef: NgbModalRef = this.modalService.open(ChannelsCreateDialogComponent, defaultSecondLayerDialogOptions);
-        modalRef.componentInstance.course = this.course;
-        modalRef.componentInstance.initialize();
-        from(modalRef.result)
-            .pipe(
-                catchError(() => EMPTY),
-                takeUntil(this.ngUnsubscribe),
-            )
-            .subscribe((channel: ChannelDTO) => {
-                this.channelActions$.next({ action: 'create', channel });
-            });
-    }
 }

src/main/webapp/app/overview/course-conversations/dialogs/conversation-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>
                     }

src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-settings/conversation-settings.component.ts

@@ -9,7 +9,7 @@ import { onError } from 'app/shared/util/global.utils';
 import { EMPTY, Subject, from, takeUntil } from 'rxjs';
 import { HttpErrorResponse } from '@angular/common/http';
 import { AlertService } from 'app/core/util/alert.service';
-import { faTimes } from '@fortawesome/free-solid-svg-icons';
+import { faTrash } from '@fortawesome/free-solid-svg-icons';
 import { canChangeChannelArchivalState, canDeleteChannel, canLeaveConversation } from 'app/shared/metis/conversations/conversation-permissions.utils';
 import { GroupChatService } from 'app/shared/metis/conversations/group-chat.service';
 import { isGroupChatDTO } from 'app/entities/metis/conversation/group-chat.model';
@@ -42,7 +42,7 @@ export class ConversationSettingsComponent implements OnInit, OnDestroy {
     private dialogErrorSource = new Subject<string>();
     dialogError$ = this.dialogErrorSource.asObservable();
 
-    faTimes = faTimes;
+    readonly faTrash = faTrash;
 
     conversationAsChannel: ChannelDTO | undefined;
     canLeaveConversation: boolean;