From d1df3e7824b29a8a004d019ee48950ca75161a2f Mon Sep 17 00:00:00 2001
From: Julian Gassner <julian.gassner@tum.de>
Date: Wed, 11 Dec 2024 15:18:04 +0100
Subject: [PATCH] Highlight solution answer in thread

---
 .../answer-post-header.component.html                  |  9 +++++++++
 .../answer-post-header/answer-post-header.component.ts |  5 +++++
 src/main/webapp/i18n/de/metis.json                     |  1 +
 src/main/webapp/i18n/en/metis.json                     |  1 +
 .../answer-post-header.component.spec.ts               | 10 ++++++++++
 5 files changed, 26 insertions(+)

diff --git a/src/main/webapp/app/shared/metis/posting-header/answer-post-header/answer-post-header.component.html b/src/main/webapp/app/shared/metis/posting-header/answer-post-header/answer-post-header.component.html
index a03fb20cced3..5b129d3f7ff4 100644
--- a/src/main/webapp/app/shared/metis/posting-header/answer-post-header/answer-post-header.component.html
+++ b/src/main/webapp/app/shared/metis/posting-header/answer-post-header/answer-post-header.component.html
@@ -34,6 +34,15 @@
                 {{ postingIsOfToday ? (posting.creationDate | artemisDate: 'time') : (posting.creationDate | artemisDate: 'short-date') }}
             </span>
         </span>
+        @if (isResolvesPostSet()) {
+            <span class="post-header-solution">
+                <span
+                    class="badge bg-info ms-2"
+                    jhiTranslate="artemisApp.metis.post.resolvesPost"
+                    ngbTooltip="{{ 'artemisApp.metis.post.resolvesPost' | artemisTranslate }}"
+                ></span>
+            </span>
+        }
         @if (!!isCommunicationPage && (!lastReadDate || (lastReadDate && posting.creationDate && posting.creationDate.isAfter(lastReadDate))) && !isAuthorOfPosting) {
             <span jhiTranslate="global.generic.new" class="badge bg-secondary hideAfter5Seconds"></span>
         }
diff --git a/src/main/webapp/app/shared/metis/posting-header/answer-post-header/answer-post-header.component.ts b/src/main/webapp/app/shared/metis/posting-header/answer-post-header/answer-post-header.component.ts
index 45bd9775fd06..1d0a1c6126d8 100644
--- a/src/main/webapp/app/shared/metis/posting-header/answer-post-header/answer-post-header.component.ts
+++ b/src/main/webapp/app/shared/metis/posting-header/answer-post-header/answer-post-header.component.ts
@@ -28,4 +28,9 @@ export class AnswerPostHeaderComponent extends PostingHeaderDirective<AnswerPost
         this.setUserProperties();
         this.setUserAuthorityIconAndTooltip();
     }
+
+    isResolvesPostSet(): boolean {
+        //Check if the post is a resolves post and if the attribute is not set return false
+        return this.posting.resolvesPost !== undefined && this.posting.resolvesPost;
+    }
 }
diff --git a/src/main/webapp/i18n/de/metis.json b/src/main/webapp/i18n/de/metis.json
index e6ab066ec220..9b1de8c73906 100644
--- a/src/main/webapp/i18n/de/metis.json
+++ b/src/main/webapp/i18n/de/metis.json
@@ -135,6 +135,7 @@
                 "collapseContent": "Inhalt einklappen",
                 "addReaction": "Reaktion hinzufügen",
                 "pinMessage": "Nachricht anheften",
+                "resolvesPost": "Lösung",
                 "unpinMessage": "Nachricht lösen",
                 "editMessage": "Nachricht bearbeiten",
                 "deleteMessage": "Nachricht löschen",
diff --git a/src/main/webapp/i18n/en/metis.json b/src/main/webapp/i18n/en/metis.json
index d983860db3c0..14bc819663fb 100644
--- a/src/main/webapp/i18n/en/metis.json
+++ b/src/main/webapp/i18n/en/metis.json
@@ -135,6 +135,7 @@
                 "collapseContent": "Collapse content",
                 "addReaction": "Add reaction",
                 "pinMessage": "Pin message",
+                "resolvesPost": "Solution",
                 "unpinMessage": "Unpin message",
                 "editMessage": "Edit message",
                 "deleteMessage": "Delete message",
diff --git a/src/test/javascript/spec/component/shared/metis/postings-header/answer-post-header/answer-post-header.component.spec.ts b/src/test/javascript/spec/component/shared/metis/postings-header/answer-post-header/answer-post-header.component.spec.ts
index 20bcc78bd7e8..eaa515be379f 100644
--- a/src/test/javascript/spec/component/shared/metis/postings-header/answer-post-header/answer-post-header.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/metis/postings-header/answer-post-header/answer-post-header.component.spec.ts
@@ -22,6 +22,7 @@ import { metisAnswerPostUser2, metisResolvingAnswerPostUser1, metisUser1 } from
 import { AccountService } from 'app/core/auth/account.service';
 import { MockAccountService } from '../../../../../helpers/mocks/service/mock-account.service';
 import { ProfilePictureComponent } from 'app/shared/profile-picture/profile-picture.component';
+import { By } from '@angular/platform-browser';
 
 describe('AnswerPostHeaderComponent', () => {
     let component: AnswerPostHeaderComponent;
@@ -92,6 +93,15 @@ describe('AnswerPostHeaderComponent', () => {
         expect(getElement(debugElement, '#today-flag')).toBeNull();
     });
 
+    it('should display solution when answerPost resolves post', () => {
+        const isResolvesPostSetSpy = jest.spyOn(component, 'isResolvesPostSet');
+        component.posting = metisResolvingAnswerPostUser1;
+        fixture.detectChanges();
+        const solution = debugElement.query(By.css('.post-header-solution'));
+        expect(isResolvesPostSetSpy).toHaveReturnedWith(true);
+        expect(solution).not.toBeNull();
+    });
+
     it('should initialize answer post not marked as resolved and not show the check to mark it as such', () => {
         // user, that is not author of original post, should not see the check to mark an answer post as resolving
         metisServiceUserIsAtLeastTutorMock.mockReturnValue(false);