Merge branch 'develop' into bugfix/fix-rescheduled-build-jobs

ls1intum · Nov 18, 2023 · b1222b2 · b1222b2
2 parents 9d008fb + a2c55f8
commit b1222b2
Show file tree

Hide file tree

Showing 6 changed files with 213 additions and 256 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
         "@angular/service-worker": "16.2.12",
         "@ctrl/ngx-emoji-mart": "9.2.0",
         "@danielmoncada/angular-datetime-picker": "16.0.1",
-        "@fingerprintjs/fingerprintjs": "4.1.0",
+        "@fingerprintjs/fingerprintjs": "4.2.1",
         "@flaviosantoro92/ngx-datatable": "1.0.2",
         "@fortawesome/angular-fontawesome": "0.13.0",
         "@fortawesome/fontawesome-svg-core": "6.4.2",
@@ -42,8 +42,8 @@
         "@sentry/tracing": "7.76.0",
         "@sentry/types": "7.76.0",
         "@swimlane/ngx-charts": "20.4.1",
-        "@swimlane/ngx-graph": "8.2.2",
-        "ace-builds": "1.31.1",
+        "@swimlane/ngx-graph": "8.2.3",
+        "ace-builds": "1.31.2",
         "bootstrap": "5.3.1",
         "brace": "0.11.1",
         "compare-versions": "6.1.0",
@@ -54,7 +54,7 @@
         "dompurify": "3.0.6",
         "export-to-csv": "0.2.1",
         "franc-min": "6.1.0",
-        "interactjs": "1.10.19",
+        "interactjs": "1.10.21",
         "ismobilejs-es5": "0.0.1",
         "js-video-url-parser": "0.5.1",
         "jszip": "3.10.1",
@@ -108,20 +108,20 @@
         "@angular/cli": "16.2.9",
         "@angular/compiler-cli": "16.2.12",
         "@angular/language-service": "16.2.12",
-        "@types/crypto-js": "4.1.3",
-        "@types/d3-shape": "3.1.4",
-        "@types/dompurify": "3.0.4",
-        "@types/jest": "29.5.7",
-        "@types/lodash-es": "4.17.10",
-        "@types/node": "20.8.10",
-        "@types/papaparse": "5.3.10",
-        "@types/showdown": "2.0.3",
+        "@types/crypto-js": "4.2.1",
+        "@types/d3-shape": "3.1.5",
+        "@types/dompurify": "3.0.5",
+        "@types/jest": "29.5.8",
+        "@types/lodash-es": "4.17.11",
+        "@types/node": "20.9.1",
+        "@types/papaparse": "5.3.11",
+        "@types/showdown": "2.0.4",
         "@types/smoothscroll-polyfill": "0.3.2",
-        "@types/sockjs-client": "1.5.3",
-        "@types/uuid": "9.0.6",
-        "@typescript-eslint/eslint-plugin": "6.9.1",
-        "@typescript-eslint/parser": "6.9.1",
-        "eslint": "8.53.0",
+        "@types/sockjs-client": "1.5.4",
+        "@types/uuid": "9.0.7",
+        "@typescript-eslint/eslint-plugin": "6.11.0",
+        "@typescript-eslint/parser": "6.11.0",
+        "eslint": "8.54.0",
         "eslint-config-prettier": "9.0.0",
         "eslint-plugin-deprecation": "2.0.0",
         "eslint-plugin-jest": "27.6.0",
@@ -136,14 +136,14 @@
         "jest-fail-on-console": "3.1.1",
         "jest-junit": "16.0.0",
         "jest-preset-angular": "13.1.2",
-        "lint-staged": "15.0.2",
+        "lint-staged": "15.1.0",
         "ng-mocks": "14.11.0",
-        "prettier": "3.0.3",
+        "prettier": "3.1.0",
         "sass": "1.69.5",
         "ts-jest": "29.1.1",
         "typescript": "5.1.6",
         "weak-napi": "2.0.2",
-        "webpack-bundle-analyzer": "4.9.1"
+        "webpack-bundle-analyzer": "4.10.1"
     },
     "engines": {
         "node": ">=18.14.0"

diff --git a/...webapp/app/exercises/programming/manage/grading/charts/category-issues-chart.component.ts b/...webapp/app/exercises/programming/manage/grading/charts/category-issues-chart.component.ts
@@ -56,10 +56,10 @@ export class CategoryIssuesChartComponent implements OnChanges {
                     this.category.state === StaticCodeAnalysisCategoryState.Inactive
                         ? '#ddd'
                         : numStudents === 0 || this.category.state !== StaticCodeAnalysisCategoryState.Graded
-                        ? '#28a745'
-                        : numIssues > maxGradedIssues
-                        ? '#dc3545'
-                        : '#ffc107',
+                          ? '#28a745'
+                          : numIssues > maxGradedIssues
+                            ? '#dc3545'
+                            : '#ffc107',
                 tooltip: `${numStudents} student${numStudents !== 1 ? 's' : ''} ${numStudents !== 1 ? 'have' : 'has'} ${numIssues} issue${numIssues !== 1 ? 's' : ''}.`,
             };
         });

diff --git a/src/main/webapp/app/shared/user-import/users-import-dialog.component.ts b/src/main/webapp/app/shared/user-import/users-import-dialog.component.ts
@@ -279,8 +279,8 @@ export class UsersImportDialogComponent implements OnDestroy {
         return !this.hasImported
             ? 0
             : this.examUserMode
-            ? this.examUsersToImport.length - this.numberOfUsersNotImported
-            : this.usersToImport.length - this.numberOfUsersNotImported;
+              ? this.examUsersToImport.length - this.numberOfUsersNotImported
+              : this.usersToImport.length - this.numberOfUsersNotImported;
     }
 
     /**

diff --git a/src/test/cypress/package-lock.json b/src/test/cypress/package-lock.json
diff --git a/src/test/cypress/package.json b/src/test/cypress/package.json
@@ -8,14 +8,14 @@
     ],
     "devDependencies": {
         "@4tw/cypress-drag-drop": "2.2.5",
-        "@types/node": "20.8.2",
+        "@types/node": "20.9.1",
         "cypress": "12.17.4",
         "cypress-cloud": "2.0.0-beta.1",
         "cypress-file-upload": "5.0.8",
         "cypress-wait-until": "2.0.1",
         "typescript": "5.2.2",
         "uuid": "9.0.1",
-        "wait-on": "7.0.1"
+        "wait-on": "7.2.0"
     },
     "overrides": {
         "semver": "7.5.3",
@@ -30,6 +30,6 @@
         "cypress:setup": "cypress install && cypress run --quiet --spec init/ImportUsers.cy.ts",
         "cypress:record:mysql": "npx cypress-cloud run --parallel --record --ci-build-id \"${SORRY_CYPRESS_BRANCH_NAME} #${SORRY_CYPRESS_BUILD_ID} ${SORRY_CYPRESS_RERUN_COUNT} (MySQL)\"",
         "cypress:record:postgres": "npx cypress-cloud run --parallel --record --ci-build-id \"${SORRY_CYPRESS_BRANCH_NAME} #${SORRY_CYPRESS_BUILD_ID} ${SORRY_CYPRESS_RERUN_COUNT} (Postgres)\"",
-        "update": "npm-upgrade"
+        "update": "ncu -i --format group"
     }
 }