Merge branch 'dev' into CSCEXAM-459

CSCfi · Dec 12, 2024 · c25f7c3 · c25f7c3
2 parents c010a80 + 0c6cfcf
commit c25f7c3
Show file tree

Hide file tree

Showing 5 changed files with 126 additions and 102 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -73,7 +73,7 @@
     "eslint-plugin-deprecation": "^3.0.0",
     "eslint-plugin-no-relative-import-paths": "^1.5.5",
     "karma": "^6.4.4",
-    "lefthook": "^1.6.1",
+    "lefthook": "^1.8.4",
     "prettier": "^3.3.3",
     "prettier-plugin-java": "^2.6.4",
     "prettier-plugin-organize-imports": "^4.0.0",

diff --git a/ui/src/app/question/library/library.component.ts b/ui/src/app/question/library/library.component.ts
@@ -27,10 +27,14 @@ import { LibraryTagsDialogComponent } from './tags/library-tags-dialog.component
         <xm-page-content [content]="content" />
         <ng-template #buttons>
             <div class="float-end pe-3">
-                <button (click)="import()" class="btn btn-success me-3">
+                <button (click)="import()" class="btn btn-success me-3 mb-3">
                     {{ 'i18n_toolbar_import_questions' | translate }}
                 </button>
-                <button [routerLink]="['new']" [queryParams]="{ nextState: 'questions' }" class="btn btn-success">
+                <button
+                    [routerLink]="['new']"
+                    [queryParams]="{ nextState: 'questions' }"
+                    class="btn btn-success align-top"
+                >
                     {{ 'i18n_toolbar_new_question' | translate }}
                 </button>
             </div>
@@ -45,6 +49,7 @@ import { LibraryTagsDialogComponent } from './tags/library-tags-dialog.component
                             popoverTitle="{{ 'i18n_instructions' | translate }}"
                             triggers="mouseenter:mouseleave"
                             class="ms-2"
+                            tabindex="0"
                         >
                             <img src="/assets/images/icon_tooltip.svg" alt="" />
                         </span>
@@ -72,38 +77,38 @@ import { LibraryTagsDialogComponent } from './tags/library-tags-dialog.component
                                 <li
                                     ngbDropdownItem
                                     role="presentation"
-                                    ngbDropdownItem
                                     [disabled]="selections.length === 0"
                                     (click)="openOwnerSelection()"
+                                    tabindex="0"
                                 >
-                                    <a role="menuitem">{{ 'i18n_add_question_owner' | translate }}</a>
+                                    {{ 'i18n_add_question_owner' | translate }}
                                 </li>
                                 <li
                                     ngbDropdownItem
                                     role="presentation"
-                                    ngbDropdownItem
                                     [disabled]="selections.length === 0"
                                     (click)="openTagSelection()"
+                                    tabindex="0"
                                 >
-                                    <a role="menuitem">{{ 'i18n_tag_questions' | translate }}</a>
+                                    {{ 'i18n_tag_questions' | translate }}
                                 </li>
                                 <li
                                     ngbDropdownItem
                                     role="presentation"
-                                    ngbDropdownItem
                                     [disabled]="selections.length === 0"
                                     (click)="openFileTransfer()"
+                                    tabindex="0"
                                 >
-                                    <a role="menuitem">{{ 'i18n_transfer_questions' | translate }}</a>
+                                    {{ 'i18n_transfer_questions' | translate }}
                                 </li>
                                 <li
                                     ngbDropdownItem
                                     role="presentation"
-                                    ngbDropdownItem
                                     [disabled]="selections.length === 0"
                                     (click)="export()"
+                                    tabindex="0"
                                 >
-                                    <a role="menuitem">{{ 'i18n_export_questions' | translate }}</a>
+                                    {{ 'i18n_export_questions' | translate }}
                                 </li>
                             </ul>
                         </span>

diff --git a/ui/src/app/question/library/results/library-results.component.html b/ui/src/app/question/library/results/library-results.component.html
@@ -125,12 +125,13 @@
                             <div>
                                 <span>
                                     @if (!disableLinks) {
-                                        <a
-                                            class="pointer"
+                                        <button
+                                            class="pointer btn btn-link btn-sm"
                                             [routerLink]="[question.id, 'edit']"
                                             [queryParams]="{ nextState: 'questions' }"
-                                            >{{ question.id }}</a
                                         >
+                                            {{ question.id }}
+                                        </button>
                                     }
                                     @if (disableLinks) {
                                         <span>#{{ question.id }}</span>
@@ -184,9 +185,9 @@
                         </td>
                         <td>
                             @if (question.attachment) {
-                                <a class="pointer" (click)="downloadQuestionAttachment(question)">
+                                <button class="btn btn-link btn-sm" (click)="downloadQuestionAttachment(question)">
                                     <i class="bi-paperclip"></i>{{ question.attachment.fileName }}
-                                </a>
+                                </button>
                             }
                         </td>
                         <td>{{ printTags(question) }}</td>
@@ -211,25 +212,25 @@
                         </td>
                         <td class="td-center-align">
                             @if (question.allowedToRemove) {
-                                <a (click)="deleteQuestion(question)" class="pointer">
+                                <button (click)="deleteQuestion(question)" class="btn btn-link text-black">
                                     <i
                                         class="bi-trash"
                                         popoverTitle="{{ 'i18n_instructions' | translate }}"
                                         triggers="mouseenter:mouseleave"
                                         ngbPopover="{{ 'i18n_exam_remove' | translate }}"
                                     ></i>
-                                </a>
+                                </button>
                             }
                         </td>
                         <td class="td-center-align">
-                            <a (click)="copyQuestion(question)">
+                            <button (click)="copyQuestion(question)" class="btn btn-link text-black">
                                 <i
                                     class="bi-files"
                                     popoverTitle="{{ 'i18n_instructions' | translate }}"
                                     triggers="mouseenter:mouseleave"
                                     ngbPopover="{{ 'i18n_copy' | translate }}"
                                 ></i>
-                            </a>
+                            </button>
                         </td>
                         <td class="td-center-align">
                             {{ question.examSectionQuestions.length }}