Merge branch 'develop' into chore/nullness-jspecify

ls1intum · Aug 17, 2024 · 0ec4c37 · 0ec4c37
2 parents aa7c94c + 5c58835
commit 0ec4c37
Show file tree

Hide file tree

Showing 14 changed files with 2,160 additions and 3,112 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,18 +13,18 @@
         "node_modules"
     ],
     "dependencies": {
-        "@angular/animations": "18.1.4",
-        "@angular/cdk": "18.1.4",
-        "@angular/common": "18.1.4",
-        "@angular/compiler": "18.1.4",
-        "@angular/core": "18.1.4",
-        "@angular/forms": "18.1.4",
-        "@angular/localize": "18.1.4",
-        "@angular/material": "18.1.4",
-        "@angular/platform-browser": "18.1.4",
-        "@angular/platform-browser-dynamic": "18.1.4",
-        "@angular/router": "18.1.4",
-        "@angular/service-worker": "18.1.4",
+        "@angular/animations": "18.2.0",
+        "@angular/cdk": "18.2.0",
+        "@angular/common": "18.2.0",
+        "@angular/compiler": "18.2.0",
+        "@angular/core": "18.2.0",
+        "@angular/forms": "18.2.0",
+        "@angular/localize": "18.2.0",
+        "@angular/material": "18.2.0",
+        "@angular/platform-browser": "18.2.0",
+        "@angular/platform-browser-dynamic": "18.2.0",
+        "@angular/router": "18.2.0",
+        "@angular/service-worker": "18.2.0",
         "@ctrl/ngx-emoji-mart": "9.2.0",
         "@danielmoncada/angular-datetime-picker": "18.1.0",
         "@fingerprintjs/fingerprintjs": "4.4.3",
@@ -37,7 +37,7 @@
         "@ng-bootstrap/ng-bootstrap": "17.0.0",
         "@ngx-translate/core": "15.0.0",
         "@ngx-translate/http-loader": "8.0.0",
-        "@sentry/angular": "8.25.0",
+        "@sentry/angular": "8.26.0",
         "@swimlane/ngx-charts": "20.5.0",
         "@swimlane/ngx-graph": "8.4.0",
         "@vscode/codicons": "0.0.36",
@@ -64,7 +64,7 @@
         "ngx-infinite-scroll": "18.0.0",
         "ngx-webstorage": "18.0.0",
         "papaparse": "5.4.1",
-        "posthog-js": "1.155.0",
+        "posthog-js": "1.155.4",
         "rxjs": "7.8.1",
         "showdown": "2.1.0",
         "showdown-highlight": "3.1.0",
@@ -110,30 +110,29 @@
         },
         "tough-cookie": "4.1.4",
         "undici": "6.19.5",
-        "vite": "5.3.5",
         "webpack-dev-middleware": "7.3.0",
         "word-wrap": "1.2.5",
         "ws": "8.18.0",
         "yargs-parser": "21.1.1"
     },
     "devDependencies": {
         "@angular-builders/jest": "18.0.0",
-        "@angular-devkit/build-angular": "18.1.4",
-        "@angular-eslint/builder": "18.2.0",
-        "@angular-eslint/eslint-plugin": "18.2.0",
-        "@angular-eslint/eslint-plugin-template": "18.2.0",
-        "@angular-eslint/schematics": "18.2.0",
-        "@angular-eslint/template-parser": "18.2.0",
-        "@angular/cli": "18.1.4",
-        "@angular/compiler-cli": "18.1.4",
-        "@angular/language-service": "18.1.4",
-        "@sentry/types": "8.25.0",
+        "@angular-devkit/build-angular": "18.2.0",
+        "@angular-eslint/builder": "18.3.0",
+        "@angular-eslint/eslint-plugin": "18.3.0",
+        "@angular-eslint/eslint-plugin-template": "18.3.0",
+        "@angular-eslint/schematics": "18.3.0",
+        "@angular-eslint/template-parser": "18.3.0",
+        "@angular/cli": "18.2.0",
+        "@angular/compiler-cli": "18.2.0",
+        "@angular/language-service": "18.2.0",
+        "@sentry/types": "8.26.0",
         "@types/crypto-js": "4.2.2",
         "@types/d3-shape": "3.1.6",
         "@types/dompurify": "3.0.5",
         "@types/jest": "29.5.12",
         "@types/lodash-es": "4.17.12",
-        "@types/node": "22.2.0",
+        "@types/node": "22.3.0",
         "@types/papaparse": "5.3.14",
         "@types/showdown": "2.0.6",
         "@types/smoothscroll-polyfill": "0.3.4",
@@ -156,7 +155,7 @@
         "jest-fail-on-console": "3.3.0",
         "jest-junit": "16.0.0",
         "jest-preset-angular": "14.2.2",
-        "lint-staged": "15.2.8",
+        "lint-staged": "15.2.9",
         "ng-mocks": "14.13.0",
         "prettier": "3.3.3",
         "sass": "1.77.8",

diff --git a/src/main/webapp/app/course/competencies/competency-rings/competency-rings.component.scss b/src/main/webapp/app/course/competencies/competency-rings/competency-rings.component.scss
@@ -17,13 +17,14 @@ svg {
         transform-origin: 50%;
     }
     .progressbar {
+        stroke-linecap: round;
+
         &-anim {
             animation: ring-appear 1s ease-in-out forwards;
             transition:
                 stroke-dasharray 1s ease-in-out,
                 opacity 1s linear;
         }
-        stroke-linecap: round;
 
         &.hidden {
             // Use opacity: 0 instead of display: none to prevent animation when appearing
@@ -56,11 +57,11 @@ svg {
             stroke: var(--competency-rings-green-bg);
         }
         .progressbar {
+            stroke: var(--competency-rings-green);
             &-anim {
                 animation-duration: 1s;
                 transition-duration: 1s;
             }
-            stroke: var(--competency-rings-green);
         }
     }
 }

diff --git a/src/main/webapp/app/course/manage/overview/course-management-card.scss b/src/main/webapp/app/course/manage/overview/course-management-card.scss
@@ -17,13 +17,14 @@
         transition: 0.15s;
         background-color: var(--background-color-for-hover) !important;
 
-        &:hover {
-            background-color: color-mix(in srgb, var(--background-color-for-hover), transparent 15%) !important;
-        }
         display: flex;
         cursor: pointer;
         height: 100px;
 
+        &:hover {
+            background-color: color-mix(in srgb, var(--background-color-for-hover), transparent 15%) !important;
+        }
+
         > div {
             flex: 0 1 auto;
         }
@@ -210,7 +211,11 @@
 
 @media screen and (max-width: 850px) {
     .card {
+        height: unset;
         .card-heading {
+            height: unset;
+            max-height: 135px;
+
             .card-header-left {
                 flex-direction: column;
                 max-width: 110px;
@@ -244,12 +249,7 @@
                 display: flex;
                 align-content: center;
             }
-
-            height: unset;
-            max-height: 135px;
         }
-
-        height: unset;
     }
 }
 

diff --git a/src/main/webapp/app/exam/manage/students/exam-students.component.scss b/src/main/webapp/app/exam/manage/students/exam-students.component.scss
@@ -47,16 +47,16 @@ jhi-exam-students {
         &.newly-registered {
             $vars: map-get($datatable-row, newly-registered);
 
+            animation-name: flash-animation;
+            animation-delay: map-get($vars, animation-delay);
+            animation-duration: map-get($vars, animation-duration);
+            animation-timing-function: ease-out;
+
             @keyframes flash-animation {
                 30% {
                     background-color: map-get($vars, background-color);
                 }
             }
-
-            animation-name: flash-animation;
-            animation-delay: map-get($vars, animation-delay);
-            animation-duration: map-get($vars, animation-duration);
-            animation-timing-function: ease-out;
         }
     }
 }
diff --git a/...ation-overview/code-hint-generation-overview/code-hint-generation-overview.component.scss b/...ation-overview/code-hint-generation-overview/code-hint-generation-overview.component.scss
@@ -36,12 +36,12 @@
 }
 
 .mat-expansion-panel.code-hint-creation-expansion-panel-wrapper-header {
+    font-weight: bold;
+    cursor: default;
+
     .mat-expansion-panel-header {
         border-bottom: 2px solid;
     }
-
-    font-weight: bold;
-    cursor: default;
 }
 
 .sort-icon {

diff --git a/...pp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.scss b/...pp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.scss
@@ -25,16 +25,15 @@
 
     .left-col {
         flex: 1 1 auto;
+        flex-direction: column;
+        min-width: 0;
+        display: flex;
+        gap: 5px;
 
         @supports (flex-basis: min-content) {
             flex: 1 1 min-content;
         }
 
-        min-width: 0;
-        display: flex;
-        flex-direction: column;
-        gap: 5px;
-
         .title-row {
             display: flex;
             gap: 5px;

diff --git a/...ebapp/app/exercises/shared/team/team-participate/team-students-online-list.component.scss b/...ebapp/app/exercises/shared/team/team-participate/team-students-online-list.component.scss
@@ -35,20 +35,20 @@
     }
 
     .student-status {
-        @include status-change-transition;
-
         display: inline-flex;
         color: var(--secondary);
-    }
 
-    .student-name {
         @include status-change-transition;
+    }
 
+    .student-name {
         max-width: 190px;
         text-overflow: ellipsis;
         overflow: hidden;
         white-space: nowrap;
         color: var(--secondary);
+
+        @include status-change-transition;
     }
 
     .online {

diff --git a/src/main/webapp/app/grading-system/bonus/bonus.component.scss b/src/main/webapp/app/grading-system/bonus/bonus.component.scss
@@ -8,18 +8,18 @@ $numbering-margin: calc($numbering-size / 2 - $numbering-border); // To make num
 }
 
 .bonus-form-step {
-    &::before {
-        counter-increment: bonus-step-counter;
-        content: counter(bonus-step-counter);
-    }
-
     border-radius: $numbering-size;
     width: $numbering-size;
     height: $numbering-size;
 
     border: $numbering-border solid;
     text-align: center;
     margin-left: $numbering-margin;
+
+    &::before {
+        counter-increment: bonus-step-counter;
+        content: counter(bonus-step-counter);
+    }
 }
 
 .bonus-calculated {

diff --git a/...ew/course-conversations/layout/conversation-messages/conversation-messages.component.scss b/...ew/course-conversations/layout/conversation-messages/conversation-messages.component.scss
@@ -1,4 +1,9 @@
 .conversation-messages {
+    --message-input-height-prod: 171px;
+    --message-input-height-dev: 187px;
+    --search-height: 52px;
+    --channel-header-height: 52px;
+
     .search-active {
         input {
             border: 1px solid var(--primary);
@@ -34,11 +39,6 @@
         padding-top: 0.375rem !important;
     }
 
-    --message-input-height-prod: 171px;
-    --message-input-height-dev: 187px;
-    --search-height: 52px;
-    --channel-header-height: 52px;
-
     .posting-infinite-scroll-container {
         max-height: calc(75vh - var(--message-input-height-prod) - var(--search-height) - var(--channel-header-height));
         overflow-y: auto;

diff --git a/src/main/webapp/app/overview/course-overview.scss b/src/main/webapp/app/overview/course-overview.scss
@@ -141,6 +141,8 @@ canvas#complete-chart {
     text-align: left;
     color: white;
     background-color: #3e8acc;
+    border: none;
+    border-radius: 1px;
     &:hover {
         background-color: #0f6ab4;
     }
@@ -150,8 +152,6 @@ canvas#complete-chart {
     &:disabled {
         background-color: gray;
     }
-    border: none;
-    border-radius: 1px;
 }
 
 /* Default the color to white even on bootstrap 5 */

diff --git a/src/main/webapp/app/shared/course-group/course-group.component.scss b/src/main/webapp/app/shared/course-group/course-group.component.scss
@@ -47,16 +47,16 @@ jhi-course-group {
         &.newly-added-member {
             $vars: map-get($datatable-row, newly-added-member);
 
+            animation-name: flash-animation;
+            animation-delay: map-get($vars, animation-delay);
+            animation-duration: map-get($vars, animation-duration);
+            animation-timing-function: ease-out;
+
             @keyframes flash-animation {
                 30% {
                     background-color: map-get($vars, background-color);
                 }
             }
-
-            animation-name: flash-animation;
-            animation-delay: map-get($vars, animation-delay);
-            animation-duration: map-get($vars, animation-duration);
-            animation-timing-function: ease-out;
         }
     }
 }
diff --git a/.../app/shared/dashboards/tutor-participation-graph/tutor-participation-graph.component.scss b/.../app/shared/dashboards/tutor-participation-graph/tutor-participation-graph.component.scss
@@ -91,6 +91,9 @@ jhi-tutor-participation-graph {
         margin-bottom: 1rem;
 
         .stacked-item {
+            margin-top: 0.5em;
+            position: relative;
+
             &:first-child {
                 margin-top: 0;
 
@@ -104,9 +107,6 @@ jhi-tutor-participation-graph {
                 }
             }
 
-            margin-top: 0.5em;
-            position: relative;
-
             &::before,
             &::after {
                 content: '';

diff --git a/src/main/webapp/app/shared/sidebar/sidebar.component.scss b/src/main/webapp/app/shared/sidebar/sidebar.component.scss
@@ -7,15 +7,14 @@
 }
 
 .scrollable-item-content {
+    overflow-y: auto;
     height: calc(100vh - var(--sidebar-footer-height-prod) - var(--header-height) - var(--search-height));
     &.content-height-dev {
         height: calc(100vh - var(--sidebar-footer-height-dev) - var(--header-height) - var(--search-height));
     }
     @media (max-width: 768px) {
         height: calc(100vh - var(--sidebar-footer-height-prod) - var(--header-height) - var(--search-height)) !important;
     }
-
-    overflow-y: auto;
 }
 
 .sidebar {