Communication: Allow users to search for answer post in course wide channels

src/main/java/de/tum/cit/aet/artemis/communication/repository/MessageSpecs.java

@@ -39,8 +39,8 @@ public static Specification<Post> getConversationSpecification(Long conversation
     }
 
     /**
-     * Specification which filters Messages according to a search string in a match-all-manner
-     * message is only kept if the search string (which is not a #id pattern) is included in the message content (all strings lowercased)
+     * Specification which filters Messages and answer posts according to a search string in a match-all-manner
+     * Message and answer post are only kept if the search string (which is not a #id pattern) is included in the message content (all strings lowercased)
      *
      * @param searchText Text to be searched within messages
      * @return specification used to chain DB operations
@@ -61,7 +61,10 @@ else if (searchText.startsWith("#") && StringUtils.isNumeric(searchText.substrin
 
                 Predicate searchInMessageContent = criteriaBuilder.like(criteriaBuilder.lower(root.get(Post_.CONTENT)), searchTextLiteral);
 
-                return criteriaBuilder.and(searchInMessageContent);
+                Join<Post, AnswerPost> answersJoin = root.join(Post_.ANSWERS, JoinType.LEFT);
+                Predicate searchInAnswerContent = criteriaBuilder.like(criteriaBuilder.lower(answersJoin.get(AnswerPost_.CONTENT)), searchTextLiteral);
+
+                return criteriaBuilder.or(searchInMessageContent, searchInAnswerContent);
             }
         });
     }
@@ -102,7 +105,7 @@ public static Specification<Post> getCourseWideChannelsSpecification(Long course
     }
 
     /**
-     * Specification to fetch Posts of the calling user
+     * Specification to fetch Posts and answer posts of the calling user
      *
      * @param filterToOwn whether only calling users own Posts should be fetched or not
      * @param userId      id of the calling user
@@ -114,7 +117,9 @@ public static Specification<Post> getOwnSpecification(boolean filterToOwn, Long
                 return null;
             }
             else {
-                return criteriaBuilder.equal(root.get(Post_.AUTHOR).get(User_.ID), userId);
+                Join<Post, AnswerPost> answersJoin = root.join(Post_.ANSWERS, JoinType.LEFT);
+                Predicate searchInAnswerContent = criteriaBuilder.equal(answersJoin.get(AnswerPost_.AUTHOR).get(User_.ID), userId);
+                return criteriaBuilder.or(criteriaBuilder.equal(root.get(Post_.AUTHOR).get(User_.ID), userId), searchInAnswerContent);
             }
         });
     }

src/main/webapp/app/entities/course.model.ts

@@ -13,6 +13,7 @@ import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model'
 import { TutorialGroupsConfiguration } from 'app/entities/tutorial-group/tutorial-groups-configuration.model';
 import { LearningPath } from 'app/entities/competency/learning-path.model';
 import { Prerequisite } from 'app/entities/prerequisite.model';
+import { Faq } from 'app/entities/faq.model';
 
 export enum CourseInformationSharingConfiguration {
     COMMUNICATION_AND_MESSAGING = 'COMMUNICATION_AND_MESSAGING',
@@ -28,6 +29,10 @@ export function isCommunicationEnabled(course: Course | undefined) {
     return config === CourseInformationSharingConfiguration.COMMUNICATION_AND_MESSAGING || config === CourseInformationSharingConfiguration.COMMUNICATION_ONLY;
 }
 
+export function isFaqEnabled(course: Course | undefined) {
+    return course?.faqEnabled;
+}
+
 /**
  * Note: Keep in sync with method in CourseRepository.java
  */
@@ -98,6 +103,7 @@ export class Course implements BaseEntity {
 
     public exercises?: Exercise[];
     public lectures?: Lecture[];
+    public faqs?: Faq[];
     public competencies?: Competency[];
     public prerequisites?: Prerequisite[];
     public learningPathsEnabled?: boolean;

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

@@ -26,13 +26,15 @@
             }
         </div>
     </div>
-    <hr class="mb-1 mt-1" />
+    <hr />
     @if (faqs?.length === 0) {
         <h2 class="markdown-preview" jhiTranslate="artemisApp.faq.noExisting"></h2>
     }
     <div>
         @for (faq of this.filteredFaqs; track faq) {
-            <jhi-course-faq-accordion [faq]="faq"></jhi-course-faq-accordion>
+            <div #faqElement id="faq-{{ faq.id }}">
+                <jhi-course-faq-accordion [faq]="faq"></jhi-course-faq-accordion>
+            </div>
         }
     </div>
     @if (filteredFaqs?.length === 0 && faqs.length > 0) {

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

@@ -1,6 +1,6 @@
-import { Component, OnDestroy, OnInit, ViewEncapsulation, inject } from '@angular/core';
+import { Component, ElementRef, OnDestroy, OnInit, ViewEncapsulation, effect, inject, viewChildren } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { debounceTime, map } from 'rxjs/operators';
+import { debounceTime, map, takeUntil } from 'rxjs/operators';
 import { BehaviorSubject, Subject, Subscription } from 'rxjs';
 import { faFilter } from '@fortawesome/free-solid-svg-icons';
 import { ButtonType } from 'app/shared/components/button.component';
@@ -17,6 +17,8 @@ import { CustomExerciseCategoryBadgeComponent } from 'app/shared/exercise-catego
 import { onError } from 'app/shared/util/global.utils';
 import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component';
 import { ArtemisMarkdownModule } from 'app/shared/markdown.module';
+import { SortService } from 'app/shared/service/sort.service';
+import { Renderer2 } from '@angular/core';
 
 @Component({
     selector: 'jhi-course-faq',
@@ -27,10 +29,12 @@ import { ArtemisMarkdownModule } from 'app/shared/markdown.module';
     imports: [ArtemisSharedComponentModule, ArtemisSharedModule, CourseFaqAccordionComponent, CustomExerciseCategoryBadgeComponent, SearchFilterComponent, ArtemisMarkdownModule],
 })
 export class CourseFaqComponent implements OnInit, OnDestroy {
+    faqElements = viewChildren<ElementRef>('faqElement');
     private ngUnsubscribe = new Subject<void>();
     private parentParamSubscription: Subscription;
 
     courseId: number;
+    referencedFaqId: number;
     faqs: Faq[];
 
     filteredFaqs: Faq[];
@@ -51,13 +55,28 @@ export class CourseFaqComponent implements OnInit, OnDestroy {
 
     private faqService = inject(FaqService);
     private alertService = inject(AlertService);
+    private sortService = inject(SortService);
+    private renderer = inject(Renderer2);
+
+    constructor() {
+        effect(() => {
+            if (this.referencedFaqId) {
+                this.scrollToFaq(this.referencedFaqId);
+            }
+        });
+    }
 
     ngOnInit(): void {
         this.parentParamSubscription = this.route.parent!.params.subscribe((params) => {
             this.courseId = Number(params.courseId);
             this.loadFaqs();
             this.loadCourseExerciseCategories(this.courseId);
         });
+
+        this.route.queryParams.pipe(takeUntil(this.ngUnsubscribe)).subscribe((params) => {
+            this.referencedFaqId = params['faqId'];
+        });
+
         this.searchInput.pipe(debounceTime(300)).subscribe((searchTerm: string) => {
             this.refreshFaqList(searchTerm);
         });
@@ -78,6 +97,7 @@ export class CourseFaqComponent implements OnInit, OnDestroy {
                 next: (res: Faq[]) => {
                     this.faqs = res;
                     this.applyFilters();
+                    this.sortFaqs();
                 },
                 error: (res: HttpErrorResponse) => onError(this.alertService, res),
             });
@@ -113,4 +133,15 @@ export class CourseFaqComponent implements OnInit, OnDestroy {
         this.applyFilters();
         this.applySearch(searchTerm);
     }
+
+    sortFaqs() {
+        this.sortService.sortByProperty(this.filteredFaqs, 'id', true);
+    }
+
+    scrollToFaq(faqId: number): void {
+        const faqElement = this.faqElements().find((faq) => faq.nativeElement.id === 'faq-' + String(faqId));
+        if (faqElement) {
+            this.renderer.selectRootElement(faqElement.nativeElement, true).scrollIntoView({ behavior: 'smooth', block: 'start' });
+        }
+    }
 }

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

@@ -68,6 +68,8 @@ import { CourseConversationsComponent } from 'app/overview/course-conversations/
 import { sortCourses } from 'app/shared/util/course.util';
 import { CourseUnenrollmentModalComponent } from './course-unenrollment-modal.component';
 import { LtiService } from 'app/shared/service/lti.service';
+import { Faq, FaqState } from 'app/entities/faq.model';
+import { FaqService } from 'app/faq/faq.service';
 import { CourseSidebarService } from 'app/overview/course-sidebar.service';
 
 interface CourseActionItem {
@@ -191,6 +193,7 @@ export class CourseOverviewComponent implements OnInit, OnDestroy, AfterViewInit
     readonly isMessagingEnabled = isMessagingEnabled;
     readonly isCommunicationEnabled = isCommunicationEnabled;
 
+    private faqService = inject(FaqService);
     private courseSidebarService: CourseSidebarService = inject(CourseSidebarService);
 
     constructor(
@@ -717,6 +720,7 @@ export class CourseOverviewComponent implements OnInit, OnDestroy, AfterViewInit
             map((res: HttpResponse<Course>) => {
                 if (res.body) {
                     this.course = res.body;
+                    this.setFaqs(this.course);
                 }
 
                 if (refresh) {
@@ -755,6 +759,23 @@ export class CourseOverviewComponent implements OnInit, OnDestroy, AfterViewInit
         return observable;
     }
 
+    /**
+     * set course property before using metis service
+     * @param {Course} course in which the metis service is used
+     */
+    setFaqs(course: Course | undefined): void {
+        if (course) {
+            this.faqService
+                .findAllByCourseIdAndState(this.courseId, FaqState.ACCEPTED)
+                .pipe(map((res: HttpResponse<Faq[]>) => res.body))
+                .subscribe({
+                    next: (res: Faq[]) => {
+                        course.faqs = res;
+                    },
+                });
+        }
+    }
+
     ngOnDestroy() {
         if (this.teamAssignmentUpdateListener) {
             this.teamAssignmentUpdateListener.unsubscribe();

src/main/webapp/app/shared/metis/metis.service.ts

@@ -494,6 +494,14 @@ export class MetisService implements OnDestroy {
         }
     }
 
+    /**
+     * returns the router link required for navigating to the exercise referenced within a faq
+     * @return {string} router link of the faq
+     */
+    getLinkForFaq(): string {
+        return `/courses/${this.getCourse().id}/faq`;
+    }
+
     /**
      * determines the routing params required for navigating to the detail view of the given post
      * @param {Post} post to be navigated to

src/main/webapp/app/shared/metis/metis.util.ts

@@ -106,6 +106,7 @@ export enum ReferenceType {
     FILE_UPLOAD = 'file-upload',
     USER = 'USER',
     CHANNEL = 'CHANNEL',
+    FAQ = 'FAQ',
     IMAGE = 'IMAGE',
 }
 

src/main/webapp/app/shared/metis/posting-content/posting-content-part/posting-content-part.components.ts

@@ -15,6 +15,7 @@ import {
     faMessage,
     faPaperclip,
     faProjectDiagram,
+    faQuestion,
 } from '@fortawesome/free-solid-svg-icons';
 import { IconProp } from '@fortawesome/fontawesome-svg-core';
 import { EnlargeSlideImageComponent } from 'app/shared/metis/posting-content/enlarge-slide-image/enlarge-slide-image.component';
@@ -43,6 +44,7 @@ export class PostingContentPartComponent {
     protected readonly faBan = faBan;
     protected readonly faAt = faAt;
     protected readonly faHashtag = faHashtag;
+    protected readonly faQuestion = faQuestion;
 
     protected readonly ReferenceType = ReferenceType;
 
@@ -99,6 +101,8 @@ export class PostingContentPartComponent {
                 return faFileUpload;
             case ReferenceType.SLIDE:
                 return faFile;
+            case ReferenceType.FAQ:
+                return faQuestion;
             default:
                 return faPaperclip;
         }

src/main/webapp/app/shared/metis/posting-content/posting-content.components.ts

@@ -117,6 +117,12 @@ export class PostingContentComponent implements OnInit, OnChanges, OnDestroy {
                     // linkToReference: link to be navigated to on reference click
                     referenceStr = this.content.substring(this.content.indexOf(']', patternMatch.startIndex)! + 1, this.content.indexOf('(', patternMatch.startIndex)!);
                     linkToReference = [this.content.substring(this.content.indexOf('(', patternMatch.startIndex)! + 1, this.content.indexOf(')', patternMatch.startIndex))];
+                } else if (ReferenceType.FAQ === referenceType) {
+                    referenceStr = this.content.substring(this.content.indexOf(']', patternMatch.startIndex)! + 1, this.content.indexOf('(/courses', patternMatch.startIndex)!);
+                    linkToReference = [
+                        this.content.substring(this.content.indexOf('(/courses', patternMatch.startIndex)! + 1, this.content.indexOf('?faqId', patternMatch.startIndex)),
+                    ];
+                    queryParams = { faqId: this.content.substring(this.content.indexOf('=') + 1, this.content.indexOf(')')) } as Params;
                 } else if (ReferenceType.ATTACHMENT === referenceType || ReferenceType.ATTACHMENT_UNITS === referenceType) {
                     // referenceStr: string to be displayed for the reference
                     // attachmentToReference: location of attachment to be opened on reference click
@@ -206,9 +212,10 @@ export class PostingContentComponent implements OnInit, OnChanges, OnDestroy {
         // Group 8: reference pattern for Lecture Units
         // Group 9: reference pattern for Users
         // Group 10: pattern for embedded images
+        // Group 11: reference pattern for FAQ
         // globally searched for, i.e. no return after first match
         const pattern =
-            /(?<POST>#\d+)|(?<PROGRAMMING>\[programming].*?\[\/programming])|(?<MODELING>\[modeling].*?\[\/modeling])|(?<QUIZ>\[quiz].*?\[\/quiz])|(?<TEXT>\[text].*?\[\/text])|(?<FILE_UPLOAD>\[file-upload].*?\[\/file-upload])|(?<LECTURE>\[lecture].*?\[\/lecture])|(?<ATTACHMENT>\[attachment].*?\[\/attachment])|(?<ATTACHMENT_UNITS>\[lecture-unit].*?\[\/lecture-unit])|(?<SLIDE>\[slide].*?\[\/slide])|(?<USER>\[user].*?\[\/user])|(?<CHANNEL>\[channel].*?\[\/channel])|(?<IMAGE>!\[.*?]\(.*?\))/g;
+            /(?<POST>#\d+)|(?<PROGRAMMING>\[programming].*?\[\/programming])|(?<MODELING>\[modeling].*?\[\/modeling])|(?<QUIZ>\[quiz].*?\[\/quiz])|(?<TEXT>\[text].*?\[\/text])|(?<FILE_UPLOAD>\[file-upload].*?\[\/file-upload])|(?<LECTURE>\[lecture].*?\[\/lecture])|(?<ATTACHMENT>\[attachment].*?\[\/attachment])|(?<ATTACHMENT_UNITS>\[lecture-unit].*?\[\/lecture-unit])|(?<SLIDE>\[slide].*?\[\/slide])|(?<USER>\[user].*?\[\/user])|(?<CHANNEL>\[channel].*?\[\/channel])|(?<IMAGE>!\[.*?]\(.*?\))|(?<FAQ>\[faq].*?\[\/faq])/g;
 
         // array with PatternMatch objects per reference found in the posting content
         const patternMatches: PatternMatch[] = [];

src/main/webapp/app/shared/metis/posting-markdown-editor/posting-markdown-editor.component.ts

@@ -21,7 +21,7 @@ import { MetisService } from 'app/shared/metis/metis.service';
 import { LectureService } from 'app/lecture/lecture.service';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
 import { ChannelService } from 'app/shared/metis/conversations/channel.service';
-import { isCommunicationEnabled } from 'app/entities/course.model';
+import { isCommunicationEnabled, isFaqEnabled } from 'app/entities/course.model';
 import { TextEditorAction } from 'app/shared/monaco-editor/model/actions/text-editor-action.model';
 import { BoldAction } from 'app/shared/monaco-editor/model/actions/bold.action';
 import { ItalicAction } from 'app/shared/monaco-editor/model/actions/italic.action';
@@ -34,6 +34,7 @@ import { ChannelReferenceAction } from 'app/shared/monaco-editor/model/actions/c
 import { UserMentionAction } from 'app/shared/monaco-editor/model/actions/communication/user-mention.action';
 import { ExerciseReferenceAction } from 'app/shared/monaco-editor/model/actions/communication/exercise-reference.action';
 import { LectureAttachmentReferenceAction } from 'app/shared/monaco-editor/model/actions/communication/lecture-attachment-reference.action';
+import { FaqReferenceAction } from 'app/shared/monaco-editor/model/actions/communication/faq-reference.action';
 import { UrlAction } from 'app/shared/monaco-editor/model/actions/url.action';
 import { AttachmentAction } from 'app/shared/monaco-editor/model/actions/attachment.action';
 import { ConversationDTO } from 'app/entities/metis/conversation/conversation.model';
@@ -93,6 +94,8 @@ export class PostingMarkdownEditorComponent implements OnInit, ControlValueAcces
             ? [new UserMentionAction(this.courseManagementService, this.metisService), new ChannelReferenceAction(this.metisService, this.channelService)]
             : [];
 
+        const faqAction = isFaqEnabled(this.metisService.getCourse()) ? [new FaqReferenceAction(this.metisService)] : [];
+
         this.defaultActions = [
             new BoldAction(),
             new ItalicAction(),
@@ -105,6 +108,7 @@ export class PostingMarkdownEditorComponent implements OnInit, ControlValueAcces
             new AttachmentAction(),
             ...messagingOnlyActions,
             new ExerciseReferenceAction(this.metisService),
+            ...faqAction,
         ];
 
         this.lectureAttachmentReferenceAction = new LectureAttachmentReferenceAction(this.metisService, this.lectureService);