Skip to content

Commit

Permalink
Merge branch 'develop' into bugfix/text-exercises/text-block-ref-edge…
Browse files Browse the repository at this point in the history
…-case
  • Loading branch information
maximiliansoelch authored Jan 14, 2025
2 parents ff0d46d + e0cda16 commit 4b88292
Show file tree
Hide file tree
Showing 1,720 changed files with 16,703 additions and 14,288 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ Refer to [Using JHipster in production](http://www.jhipster.tech/production) for
The following command can automate the deployment to a server. The example shows the deployment to the main Artemis test server (which runs a virtual machine):

```shell
./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.8.3.war
./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.9.0.war
```

## Architecture
Expand Down
4 changes: 2 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"prefix": "jhi",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:application",
"builder": "@angular/build:application",
"options": {
"allowedCommonJsDependencies": [
"@vscode/markdown-it-katex",
Expand Down Expand Up @@ -187,7 +187,7 @@
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"builder": "@angular/build:dev-server",
"options": {
"buildTarget": "artemis:build:development",
"proxyConfig": "proxy.conf.mjs",
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ plugins {
}

group = "de.tum.cit.aet.artemis"
version = "7.8.3"
version = "7.9.0"
description = "Interactive Learning with Individual Feedback"

java {
Expand Down
16 changes: 0 additions & 16 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,6 @@ module.exports = [
...tsPlugin.configs.recommended.rules,
...angularPlugin.configs.recommended.rules,
'custom-rules/enforce-no-http-client-testing-module': 'error',
'@angular-eslint/directive-selector': [
'warn',
{
type: 'attribute',
prefix: 'jhi',
style: 'camelCase',
},
],
'@angular-eslint/component-selector': [
'warn',
{
type: 'element',
prefix: 'jhi',
style: 'kebab-case',
},
],
'@typescript-eslint/no-non-null-assertion': 'off',
'@typescript-eslint/no-unsafe-return': 'off',
'@typescript-eslint/no-unsafe-member-access': 'off',
Expand Down
8 changes: 4 additions & 4 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ module.exports = {
coverageThreshold: {
global: {
// TODO: in the future, the following values should increase to at least 90%
statements: 87.81,
branches: 73.97,
functions: 82.50,
lines: 87.86,
statements: 88.18,
branches: 74.20,
functions: 81.09,
lines: 88.46,
},
},
coverageReporters: ['clover', 'json', 'lcov', 'text-summary'],
Expand Down
4,770 changes: 2,757 additions & 2,013 deletions package-lock.json

Large diffs are not rendered by default.

123 changes: 72 additions & 51 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "artemis",
"version": "7.8.3",
"version": "7.9.0",
"description": "Interactive Learning with Individual Feedback",
"private": true,
"license": "MIT",
Expand All @@ -13,38 +13,38 @@
"node_modules"
],
"dependencies": {
"@angular/animations": "18.2.13",
"@angular/cdk": "18.2.14",
"@angular/common": "18.2.13",
"@angular/compiler": "18.2.13",
"@angular/core": "18.2.13",
"@angular/forms": "18.2.13",
"@angular/localize": "18.2.13",
"@angular/material": "18.2.14",
"@angular/platform-browser": "18.2.13",
"@angular/platform-browser-dynamic": "18.2.13",
"@angular/router": "18.2.13",
"@angular/service-worker": "18.2.13",
"@angular/animations": "19.0.6",
"@angular/cdk": "19.0.5",
"@angular/common": "19.0.6",
"@angular/compiler": "19.0.6",
"@angular/core": "19.0.6",
"@angular/forms": "19.0.6",
"@angular/localize": "19.0.6",
"@angular/material": "19.0.5",
"@angular/platform-browser": "19.0.6",
"@angular/platform-browser-dynamic": "19.0.6",
"@angular/router": "19.0.6",
"@angular/service-worker": "19.0.6",
"@ctrl/ngx-emoji-mart": "9.2.0",
"@danielmoncada/angular-datetime-picker": "18.1.0",
"@danielmoncada/angular-datetime-picker": "19.0.0",
"@fingerprintjs/fingerprintjs": "4.5.1",
"@fortawesome/angular-fontawesome": "0.15.0",
"@fortawesome/angular-fontawesome": "1.0.0",
"@fortawesome/fontawesome-svg-core": "6.7.2",
"@fortawesome/free-regular-svg-icons": "6.7.2",
"@fortawesome/free-solid-svg-icons": "6.7.2",
"@ls1intum/apollon": "3.3.15",
"@ng-bootstrap/ng-bootstrap": "17.0.1",
"@ng-bootstrap/ng-bootstrap": "18.0.0",
"@ngx-translate/core": "16.0.4",
"@ngx-translate/http-loader": "16.0.1",
"@sentry/angular": "8.47.0",
"@sentry/angular": "8.48.0",
"@siemens/ngx-datatable": "22.4.1",
"@swimlane/ngx-charts": "21.1.2",
"@swimlane/ngx-graph": "9.0.1",
"@vscode/codicons": "0.0.36",
"@vscode/markdown-it-katex": "1.1.1",
"bootstrap": "5.3.3",
"compare-versions": "6.1.1",
"core-js": "3.39.0",
"core-js": "3.40.0",
"crypto-js": "4.2.0",
"dayjs": "1.11.13",
"diff-match-patch-typescript": "1.1.0",
Expand All @@ -64,9 +64,9 @@
"markdown-it-highlightjs": "4.2.0",
"mobile-drag-drop": "3.0.0-rc.0",
"monaco-editor": "0.52.2",
"ngx-infinite-scroll": "18.0.0",
"ngx-webstorage": "18.0.0",
"papaparse": "5.4.1",
"ngx-infinite-scroll": "19.0.0",
"ngx-webstorage": "19.0.1",
"papaparse": "5.5.1",
"pdf-lib": "1.17.1",
"pdfjs-dist": "4.10.38",
"rxjs": "7.8.1",
Expand All @@ -77,28 +77,49 @@
"ts-cacheable": "1.0.10",
"tslib": "2.8.1",
"turndown": "7.2.0",
"uuid": "11.0.4",
"uuid": "11.0.5",
"webstomp-client": "1.2.6",
"xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
"zone.js": "0.14.10"
"zone.js": "0.15.0"
},
"overrides": {
"@swimlane/ngx-charts": {
"@angular/animations": "^19.0.0",
"@angular/cdk": "^19.0.0",
"@angular/core": "^19.0.0",
"@angular/common": "^19.0.0",
"@angular/forms": "^19.0.0",
"@angular/platform-browser": "^19.0.0",
"@angular/platform-browser-dynamic": "^19.0.0"
},
"@swimlane/ngx-graph": {
"@angular/animations": "^19.0.0",
"@angular/common": "^19.0.0",
"@angular/core": "^19.0.0",
"@angular/cdk": "^19.0.0"
},
"@typescript-eslint/utils": {
"eslint": "^9.17.0"
"eslint": "^9.18.0"
},
"braces": "3.0.3",
"cookie": "1.0.2",
"critters": "0.0.25",
"debug": "4.4.0",
"eslint-plugin-deprecation": {
"eslint": "^9.17.0"
"eslint": "^9.18.0"
},
"express": "5.0.1",
"jsdom": "25.0.1",
"postcss": "8.4.49",
"jsdom": "26.0.0",
"ng-mocks": {
"@angular/common": "^19.0.0",
"@angular/core": "^19.0.0",
"@angular/forms": "^19.0.0",
"@angular/platform-browser": "^19.0.0"
},
"postcss": "8.5.0",
"rimraf": "6.0.1",
"semver": "7.6.3",
"tough-cookie": "5.0.0",
"tough-cookie": "5.1.0",
"vite": "5.4.11",
"webpack-dev-middleware": "7.4.2",
"webpack-dev-server": "5.2.0",
Expand All @@ -107,49 +128,49 @@
"yargs-parser": "21.1.1"
},
"devDependencies": {
"@analogjs/vite-plugin-angular": "1.11.0",
"@angular-builders/jest": "18.0.0",
"@angular-devkit/build-angular": "18.2.12",
"@angular-eslint/builder": "18.4.3",
"@angular-eslint/eslint-plugin": "18.4.3",
"@angular-eslint/eslint-plugin-template": "18.4.3",
"@angular-eslint/schematics": "18.4.3",
"@angular-eslint/template-parser": "18.4.3",
"@angular/cli": "18.2.12",
"@angular/compiler-cli": "18.2.13",
"@angular/language-service": "18.2.13",
"@sentry/types": "8.47.0",
"@analogjs/vite-plugin-angular": "1.12.0",
"@angular-builders/jest": "19.0.0",
"@angular-eslint/builder": "19.0.2",
"@angular-eslint/eslint-plugin": "19.0.2",
"@angular-eslint/eslint-plugin-template": "19.0.2",
"@angular-eslint/schematics": "19.0.2",
"@angular-eslint/template-parser": "19.0.2",
"@angular/build": "19.0.7",
"@angular/cli": "19.0.7",
"@angular/compiler-cli": "19.0.6",
"@angular/language-service": "19.0.6",
"@sentry/types": "8.48.0",
"@testing-library/angular": "17.3.5",
"@types/crypto-js": "4.2.2",
"@types/d3-shape": "3.1.6",
"@types/d3-shape": "3.1.7",
"@types/dompurify": "3.0.5",
"@types/emoji-js": "3.5.2",
"@types/jest": "29.5.14",
"@types/lodash-es": "4.17.12",
"@types/markdown-it": "14.1.2",
"@types/node": "22.10.5",
"@types/node": "22.10.6",
"@types/papaparse": "5.3.15",
"@types/smoothscroll-polyfill": "0.3.4",
"@types/sockjs-client": "1.5.4",
"@types/turndown": "5.0.5",
"@types/uuid": "10.0.0",
"@typescript-eslint/eslint-plugin": "8.19.0",
"@typescript-eslint/parser": "8.19.0",
"eslint": "9.17.0",
"eslint-config-prettier": "9.1.0",
"@typescript-eslint/eslint-plugin": "8.20.0",
"@typescript-eslint/parser": "8.20.0",
"eslint": "9.18.0",
"eslint-config-prettier": "10.0.1",
"eslint-plugin-deprecation": "3.0.0",
"eslint-plugin-jest": "28.10.0",
"eslint-plugin-jest-extended": "2.4.0",
"eslint-plugin-prettier": "5.2.1",
"folder-hash": "4.1.0",
"folder-hash": "4.1.1",
"husky": "9.1.7",
"jest": "29.7.0",
"jest-canvas-mock": "2.5.2",
"jest-date-mock": "1.0.10",
"jest-extended": "4.0.2",
"jest-fail-on-console": "3.3.1",
"jest-junit": "16.0.0",
"jest-preset-angular": "14.4.2",
"jest-preset-angular": "14.5.0",
"lint-staged": "15.3.0",
"ng-mocks": "14.13.1",
"ngxtension": "4.2.0",
Expand All @@ -158,8 +179,8 @@
"rimraf": "6.0.1",
"sass": "1.83.1",
"ts-jest": "29.2.5",
"typescript": "5.5.4",
"typescript-eslint": "8.19.0",
"typescript": "5.6.3",
"typescript-eslint": "8.20.0",
"vite-tsconfig-paths": "5.1.4",
"vitest": "2.1.8",
"weak-napi": "2.0.2"
Expand Down Expand Up @@ -190,6 +211,6 @@
"testw8": "npm run prebuild && ng test --coverage --log-heap-usage -w=8",
"update": "ncu -i --format group",
"webapp:build": "npm run clean-www && npm run prebuild -- --develop && ng build --configuration development",
"webapp:prod": "npm run clean-www && npm run prebuild && ng build --configuration production"
"webapp:prod": "npm run clean-www && npm run prebuild && NG_BUILD_OPTIMIZE_CHUNKS=1 ng build --configuration production"
}
}
16 changes: 16 additions & 0 deletions patches/ng-mocks+14.13.1.patch

Large diffs are not rendered by default.

23 changes: 12 additions & 11 deletions proxy.conf.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,23 @@
export default [
{
context: [
"/api",
"/services",
"/management",
"/swagger-resources",
"/v3/api-docs",
"/h2-console",
"/auth",
"/health",
"/public",
"/.well-known"
"/api/",
"/services/",
"/management/",
"^/management$",
"/swagger-resources/",
"/v3/api-docs/",
"/h2-console/",
"/auth/",
"/health/",
"/public/",
"/.well-known/"
],
target: `http://localhost:8080`,
secure: false
},
{
context: ["/websocket"],
context: ["/websocket/"],
target: "ws://127.0.0.1:8080",
ws: true
}
Expand Down
1 change: 0 additions & 1 deletion src/main/webapp/app/account/activate/activate.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { TranslateDirective } from 'app/shared/language/translate.directive';
@Component({
selector: 'jhi-activate',
templateUrl: './activate.component.html',
standalone: true,
imports: [TranslateDirective, RouterLink, ArtemisSharedModule],
})
export class ActivateComponent implements OnInit {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { ArtemisSharedModule } from 'app/shared/shared.module';
@Component({
selector: 'jhi-external-user-password-reset-modal',
templateUrl: './external-user-password-reset-modal.component.html',
standalone: true,
imports: [TranslateDirective, ArtemisSharedModule],
})
export class ExternalUserPasswordResetModalComponent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module';
@Component({
selector: 'jhi-password-reset-finish',
templateUrl: './password-reset-finish.component.html',
standalone: true,
imports: [TranslateDirective, RouterLink, FormsModule, ReactiveFormsModule, PasswordStrengthBarComponent, ArtemisSharedCommonModule, ArtemisSharedModule],
})
export class PasswordResetFinishComponent implements OnInit, AfterViewInit {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module';
@Component({
selector: 'jhi-password-reset-init',
templateUrl: './password-reset-init.component.html',
standalone: true,
imports: [TranslateDirective, FormsModule, ArtemisSharedCommonModule, ArtemisSharedModule],
})
export class PasswordResetInitComponent implements OnInit, AfterViewInit {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { ArtemisSharedModule } from 'app/shared/shared.module';
</ul>
</div>`,
styleUrls: ['password-strength-bar.scss'],
standalone: true,
imports: [TranslateDirective, ArtemisSharedModule],
})
export class PasswordStrengthBarComponent {
Expand Down
1 change: 0 additions & 1 deletion src/main/webapp/app/account/password/password.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module';
@Component({
selector: 'jhi-password',
templateUrl: './password.component.html',
standalone: true,
imports: [TranslateDirective, FormsModule, ReactiveFormsModule, PasswordStrengthBarComponent, ArtemisSharedCommonModule, ArtemisSharedModule],
})
export class PasswordComponent implements OnInit {
Expand Down
1 change: 0 additions & 1 deletion src/main/webapp/app/account/register/register.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module';
@Component({
selector: 'jhi-register',
templateUrl: './register.component.html',
standalone: true,
imports: [TranslateDirective, FormsModule, ReactiveFormsModule, PasswordStrengthBarComponent, ArtemisSharedCommonModule, ArtemisSharedModule],
})
export class RegisterComponent implements OnInit, AfterViewInit {
Expand Down
1 change: 0 additions & 1 deletion src/main/webapp/app/account/settings/settings.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { ArtemisSharedModule } from 'app/shared/shared.module';
@Component({
selector: 'jhi-settings',
templateUrl: './settings.component.html',
standalone: true,
imports: [TranslateDirective, FormsModule, ReactiveFormsModule, ArtemisSharedCommonModule, ArtemisSharedModule],
})
export class SettingsComponent implements OnInit {
Expand Down
Loading

0 comments on commit 4b88292

Please sign in to comment.