update type sorting

ls1intum · Feb 3, 2025 · 69fe8e0 · 69fe8e0
1 parent 83484ef
commit 69fe8e0
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 40 deletions.
diff --git a/src/main/webapp/app/shared/metis/metis.service.ts b/src/main/webapp/app/shared/metis/metis.service.ts
@@ -46,6 +46,7 @@ export class MetisService implements OnDestroy {
     private jhiWebsocketService = inject(WebsocketService);
     private conversationService = inject(ConversationService);
     private forwardedMessageService = inject(ForwardedMessageService);
+    private savedPostService: SavedPostService = inject(SavedPostService);
 
     private posts$: ReplaySubject<Post[]> = new ReplaySubject<Post[]>(1);
     private tags$: BehaviorSubject<string[]> = new BehaviorSubject<string[]>([]);
@@ -59,9 +60,7 @@ export class MetisService implements OnDestroy {
     private cachedPosts: Post[] = [];
     private cachedTotalNumberOfPosts: number;
     private subscriptionChannel?: string;
-
     private courseWideTopicSubscription: Subscription;
-    private savedPostService: SavedPostService = inject(SavedPostService);
 
     course: Course;
 

diff --git a/src/main/webapp/app/shared/metis/posting-reactions-bar/posting-reactions-bar.component.ts b/src/main/webapp/app/shared/metis/posting-reactions-bar/posting-reactions-bar.component.ts
@@ -87,32 +87,40 @@ interface ReactionMetaDataMap {
     ],
 })
 export class PostingReactionsBarComponent<T extends Posting> implements OnInit, OnChanges {
-    private metisService = inject(MetisService);
-    private accountService = inject(AccountService);
-    private conversationService: ConversationService = inject(ConversationService);
-    private modalService: NgbModal = inject(NgbModal);
-    private metisConversationService: MetisConversationService = inject(MetisConversationService);
+    readonly onBookmarkClicked = output<void>();
+    readonly DisplayPriority = DisplayPriority;
+    readonly faBookmark = faBookmark;
+    readonly faSmile = faSmile;
+    readonly faCheck = faCheck;
+    readonly faPencilAlt = faPencilAlt;
+    readonly faArrowRight = faArrowRight;
+    readonly faTrash = faTrashAlt;
+    readonly faShare = faShare;
 
     pinEmojiId: string = PIN_EMOJI_ID;
     archiveEmojiId: string = ARCHIVE_EMOJI_ID;
     closeCrossId: string = HEAVY_MULTIPLICATION_ID;
-
+    showReactionSelector = false;
+    isAtLeastTutorInCourse: boolean;
+    isAuthorOfPosting: boolean;
+    isAuthorOfOriginalPost: boolean;
+    isAnswerOfAnnouncement: boolean;
+    isAtLeastInstructorInCourse: boolean;
+    mayEdit: boolean;
+    mayDelete: boolean;
+    pinTooltip: string;
+    displayPriority: DisplayPriority;
+    canPin = false;
+    channels: ChannelDTO[] = [];
+    users: UserPublicInfoDTO[] = [];
     posting = input<T>();
     isThreadSidebar = input<boolean>();
     isEmojiCount = input<boolean>(false);
     isReadOnlyMode = input<boolean>(false);
-
     openPostingCreateEditModal = output<void>();
     closePostingCreateEditModal = output<void>();
     reactionsUpdated = output<Reaction[]>();
     isModalOpen = output<void>();
-
-    showReactionSelector = false;
-    isAtLeastTutorInCourse: boolean;
-    isAuthorOfPosting: boolean;
-    isAuthorOfOriginalPost: boolean;
-    isAnswerOfAnnouncement: boolean;
-    isAtLeastInstructorInCourse: boolean;
     mayDeleteOutput = output<boolean>();
     mayEditOutput = output<boolean>();
     canPinOutput = output<boolean>();
@@ -122,36 +130,21 @@ export class PostingReactionsBarComponent<T extends Posting> implements OnInit,
     lastReadDate = input<dayjs.Dayjs>();
     previewMode = input<boolean>();
     hoverBar = input<boolean>(true);
-
     showAnswersChange = output<boolean>();
     isLastAnswer = input<boolean>(false);
     postingUpdated = output<void>();
-    mayEdit: boolean;
-    mayDelete: boolean;
-    pinTooltip: string;
-    displayPriority: DisplayPriority;
-    canPin = false;
-    readonly DisplayPriority = DisplayPriority;
-    channels: ChannelDTO[] = [];
-    users: UserPublicInfoDTO[] = [];
-
-    isDeleteEvent = output<boolean>();
-    readonly onBookmarkClicked = output<void>();
     openThread = output<void>();
     originalPostDetails = input<Posting>();
     course = input<Course>();
-
-    // Icons
-    readonly faBookmark = faBookmark;
-    readonly faSmile = faSmile;
-    readonly faCheck = faCheck;
-    readonly faPencilAlt = faPencilAlt;
-    readonly faArrowRight = faArrowRight;
-    readonly faTrash = faTrashAlt;
-    readonly faShare = faShare;
-
+    isDeleteEvent = output<boolean>();
     createEditModal = viewChild.required<PostCreateEditModalComponent>('createEditModal');
 
+    private metisService = inject(MetisService);
+    private accountService = inject(AccountService);
+    private conversationService: ConversationService = inject(ConversationService);
+    private modalService: NgbModal = inject(NgbModal);
+    private metisConversationService: MetisConversationService = inject(MetisConversationService);
+
     /**
      * on initialization: updates the current posting and its reactions,
      * invokes metis service to check user authority
@@ -466,10 +459,11 @@ export class PostingReactionsBarComponent<T extends Posting> implements OnInit,
      * Uses openForwardMessageView from PostingsReactionsBarDirective to show the forward dialog.
      */
     forwardMessage(): void {
+        const isAnswer = this.getPostingType() === 'answerPost';
         if (!this.posting()!.content || this.posting()!.content === '') {
-            this.openForwardMessageView(this.originalPostDetails()!, false);
+            this.openForwardMessageView(this.originalPostDetails()!, isAnswer);
         } else {
-            this.openForwardMessageView(this.posting()!, false);
+            this.openForwardMessageView(this.posting()!, isAnswer);
         }
     }