Merge branch 'dev' into CSCEXAM-1256

CSCfi · Dec 11, 2023 · 8f266cb · 8f266cb
2 parents 37773a7 + 2935d3a
commit 8f266cb
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
@@ -26,13 +26,13 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
-    - name: Set up JDK 21
-      uses: actions/setup-java@v2
+    - name: Set up JDK
+      uses: actions/setup-java@v3
       with:
         java-version: 21
         distribution: temurin
 
-    - name: Set up Node 18
+    - name: Set up Node
       uses: actions/setup-node@v4
       with:
         node-version: 18.x
@@ -47,7 +47,7 @@ jobs:
         npm run build
         cd ..
 
-    - name: Run tests
+    - name: Build backend and run tests
       run: |
         sed -i 's/\/var\/log\/exam/logs/g' $GITHUB_WORKSPACE/conf/logback.xml
         sbt test

diff --git a/app/controllers/QuestionController.java b/app/controllers/QuestionController.java
@@ -139,7 +139,7 @@ public Result getQuestion(Long id, Http.Request request) {
         Query<Question> query = DB.find(Question.class);
         PathProperties pp = PathProperties.parse(
             "(*, questionOwners(id, firstName, lastName, userIdentifier, email), " +
-            "attachment(id, fileName), options(id, correctOption, defaultScore, option, claimChoiceType), tags(id, name), " +
+            "attachment(id, fileName), options(id, correctOption, defaultScore, option, claimChoiceType), tags(id, name, creator(id)), " +
             "examSectionQuestions(id, examSection(name, exam(name, state))))"
         );
         pp.apply(query);

diff --git a/ui/src/app/exam/exam.model.ts b/ui/src/app/exam/exam.model.ts
@@ -96,6 +96,7 @@ export interface ReverseQuestion extends Question {
 export interface Tag {
     id?: number;
     name: string;
+    creator?: User;
     questions: Question[];
 }
 

diff --git a/ui/src/app/question/library/results/library-results.component.ts b/ui/src/app/question/library/results/library-results.component.ts
@@ -141,7 +141,10 @@ export class LibraryResultsComponent implements OnInit, OnChanges {
         return user;
     };
 
-    printTags = (question: LibraryQuestion) => question.tags.map((t) => t.name).join(', ');
+    printTags = (question: LibraryQuestion) => {
+        const ownTags = question.tags.filter((t) => t.creator?.id === this.user.id);
+        return ownTags.map((t) => t.name).join(', ');
+    };
 
     pageSelected = (event: { page: number }) => (this.currentPage = event.page);
 

diff --git a/ui/src/app/question/tags/tag-picker.component.ts b/ui/src/app/question/tags/tag-picker.component.ts
@@ -13,11 +13,12 @@
  * See the Licence for the specific language governing permissions and limitations under the Licence.
  */
 import { HttpClient } from '@angular/common/http';
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import type { NgbTypeaheadSelectItemEvent } from '@ng-bootstrap/ng-bootstrap';
 import type { Observable } from 'rxjs';
 import { from } from 'rxjs';
 import { debounceTime, distinctUntilChanged, exhaustMap, map } from 'rxjs/operators';
+import { SessionService } from 'src/app/session/session.service';
 import type { Question, Tag } from '../../exam/exam.model';
 import { QuestionDraft } from '../question.service';
 
@@ -61,7 +62,7 @@ import { QuestionDraft } from '../question.service';
                 </div>
                 <div class="col">
                     <ul class="list-inline mart10">
-                        <li *ngFor="let tag of question.tags" class="list-inline-item">
+                        <li *ngFor="let tag of ownTags" class="list-inline-item">
                             {{ tag.name }}
                             <button
                                 class="reviewer-remove"
@@ -80,12 +81,18 @@ import { QuestionDraft } from '../question.service';
         </form>
     `,
 })
-export class TagPickerComponent {
+export class TagPickerComponent implements OnInit {
     @Input() question!: Question | QuestionDraft;
     tagName = '';
     newTag: Tag = { name: '', questions: [] };
+    ownTags: Tag[] = [];
 
-    constructor(private http: HttpClient) {}
+
+    constructor(private http: HttpClient, private Session: SessionService) {}
+
+    ngOnInit() {
+        this.ownTags = this.question.tags.filter((t) => t.creator?.id === this.Session.getUser().id);
+    }
 
     getTags$ = (text$: Observable<string>): Observable<Tag[]> =>
         text$.pipe(