Communication: Refactor sidebar design
#9356
+481
−454
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| <div class="channels-overview"> | ||
| <div class="modal-header"> | ||
| <h4 class="modal-title"> | ||
| <span>{{ 'artemisApp.dialogs.channelOverview.title' | artemisTranslate: { courseTitle: course.title } }}</span> | ||
asliayk marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </h4> | ||
| <button type="button" class="btn-close" (click)="clear()"></button> | ||
| </div> | ||
|
|
@@ -22,36 +22,6 @@ <h4 class="modal-title"> | |
| </div> | ||
| </div> | ||
| } | ||
| </div> | ||
| </div> | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,15 @@ | ||
| import { Component, Input, OnDestroy, OnInit } from '@angular/core'; | ||
| import { Observable, Subject, debounceTime, distinctUntilChanged, finalize, map, takeUntil } from 'rxjs'; | ||
|
There was a problem hiding this comment. 🧹 Nitpick (assertive) Use single quotes for string literals in imports. To adhere to the coding guidelines, please use single quotes for string literals in import statements. Apply this change: -import { Observable, Subject, debounceTime, distinctUntilChanged, finalize, map, takeUntil } from 'rxjs';
+import { Observable, Subject, debounceTime, distinctUntilChanged, finalize, map, takeUntil } from 'rxjs';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';Also applies to: 7-7 |
||
| 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 } 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 { canCreateChannel } from 'app/shared/metis/conversations/conversation-permissions.utils'; | ||
| import { AbstractDialogComponent } from 'app/overview/course-conversations/dialogs/abstract-dialog.component'; | ||
|
|
||
| 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[] = []; | ||
|
|
||
| isInitialized = false; | ||
|
|
||
| faChevronRight = faChevronRight; | ||
|
|
||
| initialize() { | ||
| super.initialize(['course', 'channelSubType']); | ||
|
|
@@ -61,7 +55,6 @@ export class ChannelsOverviewDialogComponent extends AbstractDialogComponent imp | |
| constructor( | ||
| private channelService: ChannelService, | ||
| private alertService: AlertService, | ||
|
|
||
| activeModal: NgbActiveModal, | ||
| ) { | ||
|
|
@@ -114,18 +107,6 @@ export class ChannelsOverviewDialogComponent extends AbstractDialogComponent imp | |
| case 'view': | ||
| this.close([channelAction.channel, this.channelModificationPerformed]); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -142,28 +123,12 @@ export class ChannelsOverviewDialogComponent extends AbstractDialogComponent imp | |
| ) | ||
| .subscribe({ | ||
| next: (channels: ChannelDTO[]) => { | ||
| this.channels = channels; | ||
| this.noOfChannels = this.channels.length; | ||
|
Comment on lines
+126
to
127
There was a problem hiding this comment. 🧹 Nitpick (assertive) LGTM! Consider enhancing error handling. The simplification of the Consider enhancing the error handling to provide more specific error messages, as suggested in the previous review: error: (errorResponse: HttpErrorResponse) => {
const errorMessage = errorResponse.error?.message || 'Failed to load channels';
this.alertService.error(errorMessage, null, null);
},This change will provide more informative error messages to users when channel loading fails, improving the overall user experience. |
||
| }, | ||
| error: (errorResponse: HttpErrorResponse) => { | ||
| onError(this.alertService, errorResponse); | ||
| }, | ||
| }); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -46,7 +46,7 @@ | |
| (delete)="deleteChannel()" | ||
| [dialogError]="dialogError$" | ||
| > | ||
| <fa-icon [icon]="faTrash" /> | ||
| </button> | ||
| </div> | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 { faTrash } from '@fortawesome/free-solid-svg-icons'; | ||
asliayk marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| 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(); | ||
|
|
||
| readonly faTrash = faTrash; | ||
|
|
||
| conversationAsChannel: ChannelDTO | undefined; | ||
| canLeaveConversation: boolean; | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why did you introduce extra methods for the consumption of OutputEvents it did not just call the already existing functions directly?