refactor according to reviews

ls1intum · Oct 14, 2024 · 256716f · 256716f
1 parent bf14c71
commit 256716f
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 20 deletions.
diff --git a/...e-conversations/dialogs/channels-overview-dialog/channel-item/channel-item.component.scss b/...e-conversations/dialogs/channels-overview-dialog/channel-item/channel-item.component.scss
@@ -1,5 +1,5 @@
 .channel-item {
-    padding: 10px;
+    padding: 0.5rem;
     .interaction {
         visibility: hidden;
     }

diff --git a/src/main/webapp/app/shared/course-users-selector/course-users-selector.component.ts b/src/main/webapp/app/shared/course-users-selector/course-users-selector.component.ts
@@ -123,6 +123,7 @@ export class CourseUsersSelectorComponent implements ControlValueAccessor, OnIni
 
     onInputChange(event: Event): void {
         const value = (event.target as HTMLInputElement).value;
+        // If the input value has fewer than 3 characters, close the suggestion popup
         if (value.length < 3) {
             this.typeAheadInstance.dismissPopup();
         }

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.title) }}</span
+                    {{ 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
@@ -10,15 +10,4 @@ export class SidebarCardItemComponent {
     @Input() sidebarItem: SidebarCardElement;
     @Input() sidebarType?: SidebarTypes;
     @Input() groupKey?: string;
-
-    removeChannelPrefix(name: string): string {
-        const prefixes = ['exercise-', 'lecture-', 'exam-'];
-        const channelTypes = ['exerciseChannels', 'lectureChannels', 'examChannels'];
-        for (const prefix of prefixes) {
-            if (name && name.startsWith(prefix) && channelTypes.includes(<string>this.groupKey)) {
-                return name.substring(prefix.length);
-            }
-        }
-        return name;
-    }
 }
diff --git a/src/main/webapp/app/shared/sidebar/sidebar-card.directive.ts b/src/main/webapp/app/shared/sidebar/sidebar-card.directive.ts
@@ -43,15 +43,32 @@ export class SidebarCardDirective implements OnInit, OnDestroy {
 
     private assignAttributes() {
         if (this.componentRef) {
-            this.componentRef.instance.itemSelected = this.itemSelected;
-            this.componentRef.instance.sidebarType = this.sidebarType;
-            this.componentRef.instance.sidebarItem = this.sidebarItem;
             if (this.groupKey !== undefined) {
                 this.componentRef.instance.groupKey = this.groupKey;
             }
+
+            this.componentRef.instance.itemSelected = this.itemSelected;
+            this.componentRef.instance.sidebarType = this.sidebarType;
+            this.componentRef.instance.sidebarItem = this.sidebarItem;
+            this.componentRef.instance.sidebarItem.title = this.removeChannelPrefix(this.sidebarItem.title);
+
             if (this.size == 'S') {
                 this.componentRef.instance.onUpdateSidebar = this.onUpdateSidebar;
             }
         }
     }
+
+    private removeChannelPrefix(name: string): string {
+        const prefixes = ['exercise-', 'lecture-', 'exam-'];
+        const channelTypes = ['exerciseChannels', 'lectureChannels', 'examChannels'];
+
+        if (channelTypes.includes(<string>this.groupKey)) {
+            prefixes.forEach((prefix) => {
+                if (name?.startsWith(prefix)) {
+                    name = name.substring(prefix.length);
+                }
+            });
+        }
+        return name;
+    }
 }
diff --git a/src/main/webapp/i18n/de/student-dashboard.json b/src/main/webapp/i18n/de/student-dashboard.json
@@ -68,10 +68,8 @@
                 "exerciseChannels": "Aufgaben",
                 "lectureChannels": "Vorlesungen",
                 "examChannels": "Klausuren",
-                "addChannelChat": "Kanal/Chat hinzufügen",
                 "createChannel": "Kanal erstellen",
                 "browseChannels": "Kanäle durchsuchen",
-                "createChat": "Chat erstellen",
                 "createGroupChat": "Gruppenchat erstellen",
                 "createDirectChat": "Direkt-Chat erstellen",
                 "groupChats": "Gruppenchats",

diff --git a/src/main/webapp/i18n/en/student-dashboard.json b/src/main/webapp/i18n/en/student-dashboard.json
@@ -68,10 +68,8 @@
                 "exerciseChannels": "Exercises",
                 "lectureChannels": "Lectures",
                 "examChannels": "Exams",
-                "addChannelChat": "Add Channel/Chat",
                 "createChannel": "Create channel",
                 "browseChannels": "Browse channels",
-                "createChat": "Create Chat",
                 "createGroupChat": "Create group chat",
                 "createDirectChat": "Create direct chat",
                 "groupChats": "Group Chats",