From 666f8491e4bc73f1022a58355e52a574fc448b8a Mon Sep 17 00:00:00 2001 From: Alexander Vogt Date: Fri, 6 Sep 2024 09:26:21 +0200 Subject: [PATCH 01/22] implement new fucntions for edge thickness and opacity --- report-viewer/src/components/ClusterGraph.vue | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/report-viewer/src/components/ClusterGraph.vue b/report-viewer/src/components/ClusterGraph.vue index 3d9686f9c..f2dd4d6c8 100644 --- a/report-viewer/src/components/ClusterGraph.vue +++ b/report-viewer/src/components/ClusterGraph.vue @@ -165,17 +165,20 @@ const maximumSimilarity = computed(() => { return maximumSimilarity }) -function getClampedSimilarityFromKeyIndex(firstIndex: number, secondIndex: number) { +function getClampedSimilarityFromKeyIndex( + firstIndex: number, + secondIndex: number, + min: number, + max: number +) { const similarity = getSimilarityFromKeyIndex(firstIndex, secondIndex) if (similarity == 0) { return 0 } - if (minimumSimilarity.value == maximumSimilarity.value) { + if (min == max) { return 1 } - return ( - (similarity - minimumSimilarity.value) / (maximumSimilarity.value - minimumSimilarity.value) - ) + return (similarity - min) / (max - min) } function getEdgeAlphaFromKeyIndex(firstIndex: number, secondIndex: number) { @@ -183,7 +186,16 @@ function getEdgeAlphaFromKeyIndex(firstIndex: number, secondIndex: number) { if (similarity == 0) { return 1 } - return getClampedSimilarityFromKeyIndex(firstIndex, secondIndex) * 0.7 + 0.3 + return ( + getClampedSimilarityFromKeyIndex( + firstIndex, + secondIndex, + Math.min(minimumSimilarity.value, 0.5), + maximumSimilarity.value + ) * + 0.7 + + 0.3 + ) } function getEdgeWidth(firstIndex: number, secondIndex: number) { @@ -191,7 +203,7 @@ function getEdgeWidth(firstIndex: number, secondIndex: number) { if (similarity == 0) { return 0.5 } - return getClampedSimilarityFromKeyIndex(firstIndex, secondIndex) * 5 + 1 + return getClampedSimilarityFromKeyIndex(firstIndex, secondIndex, 0, 1) * 5 + 1 } function getEdgeDashStyle(firstIndex: number, secondIndex: number) { From 9bd96a1af2dbe5f7e89c859425d6c944e18aff95 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 13:12:52 +0200 Subject: [PATCH 02/22] Dependency(deps-dev): Bump @playwright/test from 1.46.0 to 1.47.0 in /report-viewer (#1976) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- report-viewer/package-lock.json | 24 ++++++++++++------------ report-viewer/package.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json index 5087f2c21..ae53b33ab 100644 --- a/report-viewer/package-lock.json +++ b/report-viewer/package-lock.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@pinia/testing": "^0.1.5", - "@playwright/test": "^1.46.0", + "@playwright/test": "^1.47.0", "@rushstack/eslint-patch": "^1.10.4", "@types/jsdom": "^21.1.7", "@types/node": "^22.5.3", @@ -881,12 +881,12 @@ } }, "node_modules/@playwright/test": { - "version": "1.46.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.46.0.tgz", - "integrity": "sha512-/QYft5VArOrGRP5pgkrfKksqsKA6CEFyGQ/gjNe6q0y4tZ1aaPfq4gIjudr1s3D+pXyrPRdsy4opKDrjBabE5w==", + "version": "1.47.0", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.47.0.tgz", + "integrity": "sha512-SgAdlSwYVpToI4e/IH19IHHWvoijAYH5hu2MWSXptRypLSnzj51PcGD+rsOXFayde4P9ZLi+loXVwArg6IUkCA==", "dev": true, "dependencies": { - "playwright": "1.46.0" + "playwright": "1.47.0" }, "bin": { "playwright": "cli.js" @@ -5310,12 +5310,12 @@ } }, "node_modules/playwright": { - "version": "1.46.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.46.0.tgz", - "integrity": "sha512-XYJ5WvfefWONh1uPAUAi0H2xXV5S3vrtcnXe6uAOgdGi3aSpqOSXX08IAjXW34xitfuOJsvXU5anXZxPSEQiJw==", + "version": "1.47.0", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.47.0.tgz", + "integrity": "sha512-jOWiRq2pdNAX/mwLiwFYnPHpEZ4rM+fRSQpRHwEwZlP2PUANvL3+aJOF/bvISMhFD30rqMxUB4RJx9aQbfh4Ww==", "dev": true, "dependencies": { - "playwright-core": "1.46.0" + "playwright-core": "1.47.0" }, "bin": { "playwright": "cli.js" @@ -5328,9 +5328,9 @@ } }, "node_modules/playwright-core": { - "version": "1.46.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.46.0.tgz", - "integrity": "sha512-9Y/d5UIwuJk8t3+lhmMSAJyNP1BUC/DqP3cQJDQQL/oWqAiuPTLgy7Q5dzglmTLwcBRdetzgNM/gni7ckfTr6A==", + "version": "1.47.0", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.47.0.tgz", + "integrity": "sha512-1DyHT8OqkcfCkYUD9zzUTfg7EfTd+6a8MkD/NWOvjo0u/SCNd5YmY/lJwFvUZOxJbWNds+ei7ic2+R/cRz/PDg==", "dev": true, "bin": { "playwright-core": "cli.js" diff --git a/report-viewer/package.json b/report-viewer/package.json index 4004fef36..de374b802 100644 --- a/report-viewer/package.json +++ b/report-viewer/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "@pinia/testing": "^0.1.5", - "@playwright/test": "^1.46.0", + "@playwright/test": "^1.47.0", "@rushstack/eslint-patch": "^1.10.4", "@types/jsdom": "^21.1.7", "@types/node": "^22.5.3", From 52dcd6f6ec9d04d2ed8ede8b70b6260a268ce474 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 13:14:13 +0200 Subject: [PATCH 03/22] Dependency(deps-dev): Bump vue-tsc from 2.1.4 to 2.1.6 in /report-viewer (#1977) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- report-viewer/package-lock.json | 16 ++++++++-------- report-viewer/package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json index ae53b33ab..ba953588f 100644 --- a/report-viewer/package-lock.json +++ b/report-viewer/package-lock.json @@ -49,7 +49,7 @@ "typescript": "^5.5.4", "vite": "^5.4.2", "vitest": "^2.0.5", - "vue-tsc": "^2.1.4" + "vue-tsc": "^2.1.6" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -1589,9 +1589,9 @@ } }, "node_modules/@vue/language-core": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.1.4.tgz", - "integrity": "sha512-i8pfAgNjTNjabBX1xRsuV6aRw2E8bdQXwd5H8m3cUkTVJju3QN5nfdoXET0uK+yXsuloNJPzo6PXFujRRPNmMA==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.1.6.tgz", + "integrity": "sha512-MW569cSky9R/ooKMh6xa2g1D0AtRKbL56k83dzus/bx//RDJk24RHWkMzbAlXjMdDNyxAaagKPRquBIxkxlCkg==", "dev": true, "dependencies": { "@volar/language-core": "~2.4.1", @@ -7138,13 +7138,13 @@ } }, "node_modules/vue-tsc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.1.4.tgz", - "integrity": "sha512-XTzMXQcsixAvNbpou/9qngEsZawaiJRZH3Ja+lfgRfv2A1TJv9vnZ/Kyv7XxPqv/TaZVFSnjGpM87VbWIg6yQg==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.1.6.tgz", + "integrity": "sha512-f98dyZp5FOukcYmbFpuSCJ4Z0vHSOSmxGttZJCsFeX0M4w/Rsq0s4uKXjcSRsZqsRgQa6z7SfuO+y0HVICE57Q==", "dev": true, "dependencies": { "@volar/typescript": "~2.4.1", - "@vue/language-core": "2.1.4", + "@vue/language-core": "2.1.6", "semver": "^7.5.4" }, "bin": { diff --git a/report-viewer/package.json b/report-viewer/package.json index de374b802..c304fbeaa 100644 --- a/report-viewer/package.json +++ b/report-viewer/package.json @@ -60,6 +60,6 @@ "typescript": "^5.5.4", "vite": "^5.4.2", "vitest": "^2.0.5", - "vue-tsc": "^2.1.4" + "vue-tsc": "^2.1.6" } } From 7125ec754f76745810ec9429b4e7411fcc890123 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 13:20:55 +0200 Subject: [PATCH 04/22] Dependency(deps-dev): Bump lint-staged from 15.2.9 to 15.2.10 in /report-viewer (#1980) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- report-viewer/package-lock.json | 16 ++++++++-------- report-viewer/package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json index ba953588f..7b7695419 100644 --- a/report-viewer/package-lock.json +++ b/report-viewer/package-lock.json @@ -40,7 +40,7 @@ "eslint": "^8.57.0", "eslint-plugin-vue": "^9.27.0", "jsdom": "^24.1.1", - "lint-staged": "^15.2.9", + "lint-staged": "^15.2.10", "npm-run-all": "^4.1.5", "postcss": "^8.4.45", "prettier": "^3.3.3", @@ -4161,9 +4161,9 @@ "dev": true }, "node_modules/lint-staged": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.9.tgz", - "integrity": "sha512-BZAt8Lk3sEnxw7tfxM7jeZlPRuT4M68O0/CwZhhaw6eeWu0Lz5eERE3m386InivXB64fp/mDID452h48tvKlRQ==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.10.tgz", + "integrity": "sha512-5dY5t743e1byO19P9I4b3x8HJwalIznL5E1FWYnU6OWw33KxNBSLAc6Cy7F2PsFEO8FKnLwjwm5hx7aMF0jzZg==", "dev": true, "dependencies": { "chalk": "~5.3.0", @@ -4172,7 +4172,7 @@ "execa": "~8.0.1", "lilconfig": "~3.1.2", "listr2": "~8.2.4", - "micromatch": "~4.0.7", + "micromatch": "~4.0.8", "pidtree": "~0.6.0", "string-argv": "~0.3.2", "yaml": "~2.5.0" @@ -4526,9 +4526,9 @@ } }, "node_modules/micromatch": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", - "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "dependencies": { "braces": "^3.0.3", diff --git a/report-viewer/package.json b/report-viewer/package.json index c304fbeaa..39b2d48e7 100644 --- a/report-viewer/package.json +++ b/report-viewer/package.json @@ -51,7 +51,7 @@ "eslint": "^8.57.0", "eslint-plugin-vue": "^9.27.0", "jsdom": "^24.1.1", - "lint-staged": "^15.2.9", + "lint-staged": "^15.2.10", "npm-run-all": "^4.1.5", "postcss": "^8.4.45", "prettier": "^3.3.3", From 371bad2af843480f1727bd739892bfc7a40d6fd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 09:51:02 +0000 Subject: [PATCH 05/22] Dependency(deps): Bump org.eclipse.platform:org.eclipse.core.resources Bumps [org.eclipse.platform:org.eclipse.core.resources](https://github.com/eclipse-platform/eclipse.platform) from 3.20.200 to 3.21.0. - [Commits](https://github.com/eclipse-platform/eclipse.platform/commits) --- updated-dependencies: - dependency-name: org.eclipse.platform:org.eclipse.core.resources dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 66c2957ec..8b347bb9e 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ 2.37.0 2.31.0 2.38.0 - 3.20.200 + 3.21.0 1.1.0 From 92a0a84d5060287dadeba2a4aee8cafb5538fa67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 13:31:00 +0200 Subject: [PATCH 06/22] Dependency(deps-dev): Bump vite from 5.4.2 to 5.4.4 in /report-viewer (#1979) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- report-viewer/package-lock.json | 10 +++++----- report-viewer/package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json index 7b7695419..40000c093 100644 --- a/report-viewer/package-lock.json +++ b/report-viewer/package-lock.json @@ -47,7 +47,7 @@ "prettier-plugin-tailwindcss": "^0.6.6", "tailwindcss": "^3.4.10", "typescript": "^5.5.4", - "vite": "^5.4.2", + "vite": "^5.4.4", "vitest": "^2.0.5", "vue-tsc": "^2.1.6" } @@ -6875,13 +6875,13 @@ } }, "node_modules/vite": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.2.tgz", - "integrity": "sha512-dDrQTRHp5C1fTFzcSaMxjk6vdpKvT+2/mIdE07Gw2ykehT49O0z/VHS3zZ8iV/Gh8BJJKHWOe5RjaNrW5xf/GA==", + "version": "5.4.4", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.4.tgz", + "integrity": "sha512-RHFCkULitycHVTtelJ6jQLd+KSAAzOgEYorV32R2q++M6COBjKJR6BxqClwp5sf0XaBDjVMuJ9wnNfyAJwjMkA==", "dev": true, "dependencies": { "esbuild": "^0.21.3", - "postcss": "^8.4.41", + "postcss": "^8.4.43", "rollup": "^4.20.0" }, "bin": { diff --git a/report-viewer/package.json b/report-viewer/package.json index 39b2d48e7..4ac315200 100644 --- a/report-viewer/package.json +++ b/report-viewer/package.json @@ -58,7 +58,7 @@ "prettier-plugin-tailwindcss": "^0.6.6", "tailwindcss": "^3.4.10", "typescript": "^5.5.4", - "vite": "^5.4.2", + "vite": "^5.4.4", "vitest": "^2.0.5", "vue-tsc": "^2.1.6" } From 610823f7f7b0ca8fb1b4ced27122fe77ea27ba20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 13:53:23 +0200 Subject: [PATCH 07/22] Dependency(deps): Bump vue-router from 4.4.3 to 4.4.4 in /report-viewer (#1978) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- report-viewer/package-lock.json | 16 ++++++++-------- report-viewer/package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json index 40000c093..514c32a7f 100644 --- a/report-viewer/package-lock.json +++ b/report-viewer/package-lock.json @@ -22,7 +22,7 @@ "vue": "^3.4.38", "vue-chartjs": "^5.3.1", "vue-draggable-next": "^2.2.1", - "vue-router": "^4.4.3", + "vue-router": "^4.4.4", "vue-virtual-scroller": "^2.0.0-beta.8" }, "devDependencies": { @@ -1546,9 +1546,9 @@ } }, "node_modules/@vue/devtools-api": { - "version": "6.6.3", - "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.3.tgz", - "integrity": "sha512-0MiMsFma/HqA6g3KLKn+AGpL1kgKhFWszC9U29NfpWK5LE7bjeXxySWJrOJ77hBz+TBrBQ7o4QJqbPbqbs8rJw==" + "version": "6.6.4", + "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz", + "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==" }, "node_modules/@vue/eslint-config-prettier": { "version": "9.0.0", @@ -7124,11 +7124,11 @@ } }, "node_modules/vue-router": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.4.3.tgz", - "integrity": "sha512-sv6wmNKx2j3aqJQDMxLFzs/u/mjA9Z5LCgy6BE0f7yFWMjrPLnS/sPNn8ARY/FXw6byV18EFutn5lTO6+UsV5A==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.4.4.tgz", + "integrity": "sha512-3MlnDqwRwZwCQVbtVfpsU+nrNymNjnXSsQtXName5925NVC1+326VVfYH9vSrA0N13teGEo8z5x7gbRnGjCDiQ==", "dependencies": { - "@vue/devtools-api": "^6.6.3" + "@vue/devtools-api": "^6.6.4" }, "funding": { "url": "https://github.com/sponsors/posva" diff --git a/report-viewer/package.json b/report-viewer/package.json index 4ac315200..00b7f9605 100644 --- a/report-viewer/package.json +++ b/report-viewer/package.json @@ -33,7 +33,7 @@ "vue": "^3.4.38", "vue-chartjs": "^5.3.1", "vue-draggable-next": "^2.2.1", - "vue-router": "^4.4.3", + "vue-router": "^4.4.4", "vue-virtual-scroller": "^2.0.0-beta.8" }, "devDependencies": { From 119a4861c3ca564f3dc5af5dfb7d4743448be657 Mon Sep 17 00:00:00 2001 From: Alexander Vogt Date: Thu, 12 Sep 2024 10:48:24 +0200 Subject: [PATCH 08/22] first draft of e2e test readme --- report-viewer/tests/e2e/README.md | 62 +++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 report-viewer/tests/e2e/README.md diff --git a/report-viewer/tests/e2e/README.md b/report-viewer/tests/e2e/README.md new file mode 100644 index 000000000..3b027a556 --- /dev/null +++ b/report-viewer/tests/e2e/README.md @@ -0,0 +1,62 @@ +# Complete System e2e Tests + +The e2e tests are executed by the [complete e2e tests workflow](../../../.github/workflows/complete-e2e.yml) and are meant to check the entire process from building and executing JPlag to viewing the report in the report viewer. +The tests get run on 3 different operating systems: Windows, Ubuntu and MacOS. + +## Structure + +First in the `build_jar` job the JPlag jar is built. + +Then in the `run_jplag` job the JPlag jar is executed with the test data. Here using matrix, JPlag is run for each dataset on each operating system. + +Finally in the `e2e_test` job the playwright tests specified here are run. The tests are run on each operating system. + +### Open Comparison Tests + +The `OpenComparisonTest.spec.ts` test, loads each of the specified reports and tries to open its top comparison. This is done to ensure that basic functionality of JPlag is working. +We test that the most used languages are working correctly and that the report viewer does not throw an error opening them. We also test that all ways to give files as single files or folders are exported into their respective reports. + +### Other Tests + +The other tests are testing the functionality of the report viewer. Each of them tests one view and makes sure all the features are working correctly. + +## Running the tests locally + +1) To run the tests locally get the zips of the datasets from the [GitHub](../../../.github/workflows/files/) and execute JPlag on its contents. +2) Build the report viewer using `npm run build` +3) Run the e2e tests using `npm run test:e2e` + +## Adding new tests + +If you want to add new tests we suggest doing the following tests: + +1) Create a dataset you can upload to GitHub + - Copy the zip of the dataset into [the workflow files folder](../../../.github/workflows/files/) + - Execute it on your device, so you can test your new test locally + - If you want to add the dataset to `OpenComparisonTest.spec.ts` make sure there is a clear top comparison and you do not have multiple comparisons with the same percentage as the top comparison +2) Add the test to the matrix in the [complete e2e tests workflow](../../../.github/workflows/complete-e2e.yml) + - zip: The name of the zip file in the files folder + - name: The name of the dataset. This name should be unique + - folder: This is the main folder of the dataset, that gets passed to JPlag as a positional argument + - language: The language JPlag should use. This should be the same name passed to the `-l` parameter + - cliArgs: Additional arguments to pass to JPlag. This could be used to specify basecode or give JPlag more folders over `--new`/`--old` + +3) Add the test to the playwright e2e tests. + - Adding a test to `OpenComparisonTest`: + - Add the dataset name to the `datasets` array + - Specify the name of the zip that should be opened. They follow the pattern `DATASET_NAME-report.zip` + - Specify the names of the submissions of the top comparisons. These are given as regexes + - Adding a completly new Test: + - Create a new file in this folder with the file ending `.spec.ts` + - Add a new test according to the playwright documentation (examples are in the other tests) + - The test should start like this + ```typescript + test('Name of the test', async ({ page }) => { + await page.goto('/') + await uploadFile('YOUR_DATASET_NAME-report.zip', page) + // Your test code + }); + ``` + This will start you on the overview page with the dataset loaded + +4) Run the tests locally to make sure they are working \ No newline at end of file From 87554d005f684dbb817e39d275f44d7457a8c507 Mon Sep 17 00:00:00 2001 From: Alexander Vogt Date: Thu, 12 Sep 2024 10:50:47 +0200 Subject: [PATCH 09/22] add complete e2e tests to wiki --- docs/5.-End-to-End-Testing.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/5.-End-to-End-Testing.md b/docs/5.-End-to-End-Testing.md index be2cbd59d..db9080e80 100644 --- a/docs/5.-End-to-End-Testing.md +++ b/docs/5.-End-to-End-Testing.md @@ -1 +1,8 @@ +JPlag has two different types of end-to-end tests. + +# Maven end-to-end-tests +There is a module inside the maven project, that runs e2e tests on the core of Jplag. The basic structure of the end-to-end testing module is discussed in the [corresponding readme file](https://github.com/jplag/JPlag/blob/master/endtoend-testing/README.md). + +# Complete end-to-end-tests +The complete end-to-end tests are executed by the [complete e2e tests workflow](../../../.github/workflows/complete-e2e.yml) and are meant to check the entire process from building and executing JPlag to viewing the report in the report viewer. Details are specified in the [corresponding readme file](../report-viewer/tests/e2e/README.md). \ No newline at end of file From 8406624dd8edad2f9b66406dc06b83b8a0891c23 Mon Sep 17 00:00:00 2001 From: Alex | Kronox <39801116+Kr0nox@users.noreply.github.com> Date: Thu, 12 Sep 2024 10:53:09 +0200 Subject: [PATCH 10/22] Fix indentation of bullet points --- report-viewer/tests/e2e/README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/report-viewer/tests/e2e/README.md b/report-viewer/tests/e2e/README.md index 3b027a556..c2338de5e 100644 --- a/report-viewer/tests/e2e/README.md +++ b/report-viewer/tests/e2e/README.md @@ -35,11 +35,11 @@ If you want to add new tests we suggest doing the following tests: - Execute it on your device, so you can test your new test locally - If you want to add the dataset to `OpenComparisonTest.spec.ts` make sure there is a clear top comparison and you do not have multiple comparisons with the same percentage as the top comparison 2) Add the test to the matrix in the [complete e2e tests workflow](../../../.github/workflows/complete-e2e.yml) - - zip: The name of the zip file in the files folder - - name: The name of the dataset. This name should be unique - - folder: This is the main folder of the dataset, that gets passed to JPlag as a positional argument - - language: The language JPlag should use. This should be the same name passed to the `-l` parameter - - cliArgs: Additional arguments to pass to JPlag. This could be used to specify basecode or give JPlag more folders over `--new`/`--old` + - zip: The name of the zip file in the files folder + - name: The name of the dataset. This name should be unique + - folder: This is the main folder of the dataset, that gets passed to JPlag as a positional argument + - language: The language JPlag should use. This should be the same name passed to the `-l` parameter + - cliArgs: Additional arguments to pass to JPlag. This could be used to specify basecode or give JPlag more folders over `--new`/`--old` 3) Add the test to the playwright e2e tests. - Adding a test to `OpenComparisonTest`: @@ -59,4 +59,4 @@ If you want to add new tests we suggest doing the following tests: ``` This will start you on the overview page with the dataset loaded -4) Run the tests locally to make sure they are working \ No newline at end of file +4) Run the tests locally to make sure they are working From 5660b725d113fb8238259df60a17f40e75b221da Mon Sep 17 00:00:00 2001 From: Alex | Kronox Date: Thu, 12 Sep 2024 16:43:03 +0200 Subject: [PATCH 11/22] look up index in sorted files --- report-viewer/src/components/fileDisplaying/FilesContainer.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report-viewer/src/components/fileDisplaying/FilesContainer.vue b/report-viewer/src/components/fileDisplaying/FilesContainer.vue index 9c03e3e9d..ba868150f 100644 --- a/report-viewer/src/components/fileDisplaying/FilesContainer.vue +++ b/report-viewer/src/components/fileDisplaying/FilesContainer.vue @@ -177,7 +177,7 @@ const tokenCount = computed(() => { * @param line Line to scroll to. */ function scrollTo(file: string, line: number) { - const fileIndex = Array.from(props.files).findIndex((f) => f.fileName === file) + const fileIndex = sortedFiles.value.findIndex((f) => f.fileName === file) if (fileIndex !== -1) { codePanels.value[fileIndex].expand() nextTick(() => { From 5de139c230461dd5a2beb369fb314e7564603a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Sa=C4=9Flam?= Date: Fri, 13 Sep 2024 15:49:52 +0200 Subject: [PATCH 12/22] Update report-viewer/tests/e2e/README.md --- report-viewer/tests/e2e/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report-viewer/tests/e2e/README.md b/report-viewer/tests/e2e/README.md index c2338de5e..c5e07d590 100644 --- a/report-viewer/tests/e2e/README.md +++ b/report-viewer/tests/e2e/README.md @@ -46,7 +46,7 @@ If you want to add new tests we suggest doing the following tests: - Add the dataset name to the `datasets` array - Specify the name of the zip that should be opened. They follow the pattern `DATASET_NAME-report.zip` - Specify the names of the submissions of the top comparisons. These are given as regexes - - Adding a completly new Test: + - Adding a completely new Test: - Create a new file in this folder with the file ending `.spec.ts` - Add a new test according to the playwright documentation (examples are in the other tests) - The test should start like this From 9a131959bbaf1062f5579080d9dc7afda81274c5 Mon Sep 17 00:00:00 2001 From: Alexander Vogt Date: Sat, 14 Sep 2024 14:52:03 +0200 Subject: [PATCH 13/22] update contributing chapter in wiki --- docs/3.-Contributing-to-JPlag.md | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/docs/3.-Contributing-to-JPlag.md b/docs/3.-Contributing-to-JPlag.md index d60d33408..f87801e79 100644 --- a/docs/3.-Contributing-to-JPlag.md +++ b/docs/3.-Contributing-to-JPlag.md @@ -4,10 +4,14 @@ If you are new to JPlag, maybe check the [good first issues](https://github.com/ Please try to make well-documented and clearly structured submissions: * All artifacts (code, comments...) should be in English * Please avoid abbreviations! -* Make use of JavaDoc to document classes and public methods -* We provide a [formatter configuration](https://github.com/jplag/JPlag/blob/master/formatter.xml), which is enforced by spotless - * Eclipse/IntelliJ users can use it directly - * It can always be applied via maven with `mvn spotless:apply` +* Make use of JavaDoc/TsDoc to document classes and public methods +* We provide a formatter configurations + * For java code we use this [formatter configuration](https://github.com/jplag/JPlag/blob/master/formatter.xml), which is enforced by spotless + * Eclipse/IntelliJ users can use it directly + * It can always be applied via maven with `mvn spotless:apply` + * For typescript/vue code we use prettier und eslint + * They can both be executed with `npm run lint` and `npm run format` + * They can also be executed automatically on commit * Use well-explained pull requests to propose your features * When re-using code from other projects, mark them accordingly and make sure their license allows the re-use * Your changes should always improve the code quality of the codebase, especially when working on older components @@ -17,12 +21,17 @@ Please try to make well-documented and clearly structured submissions: ## Building from sources 1. Download or clone the code from this repository. +### Core 2. Run `mvn clean package` from the root of the repository to compile and build all submodules. - Run `mvn clean package assembly:single` instead if you need the full jar, which includes all dependencies. -5. You will find the generated JARs in the subdirectory `jplag.cli/target`. + Run `mvn clean package assembly:single -P with-report-viewer` instead if you need the full jar, which includes all dependencies. +3. You will find the generated JARs in the subdirectory `jplag.cli/target`. +### Report Viewer +2. Run `npm install` to install all dependencies. +3. Run `npm run dev` to launch the development server. The report viewer will be available at `http://localhost:8080/`. + Different versions of the build command are described in the [report-viewer README](../report-viewer/README.md). ### Git hooks -The repository contains a pre-commit hook that prevents commits if they fail spotless. -To set up the hooks, call `git config --local core.hooksPath gitHooks/hooks` once within your local repository. +The repository contains a pre-commit hook that prevents commits if they fail spotless and executes prettier and eslint on report-viewer code. +To set up the hooks, call `git config --local core.hooksPath gitHooks/hooks` once within your local repository or run `npm i`/`npm run prepare` in the report-viewer package. From 5b98e7d39356414083bdec98026c11c2bf078b49 Mon Sep 17 00:00:00 2001 From: Alexander Vogt Date: Sun, 15 Sep 2024 08:38:04 +0200 Subject: [PATCH 14/22] update section on report file generation --- docs/6.-Report-File-Generation.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/6.-Report-File-Generation.md b/docs/6.-Report-File-Generation.md index 3753993d6..3d1fd24d6 100644 --- a/docs/6.-Report-File-Generation.md +++ b/docs/6.-Report-File-Generation.md @@ -32,6 +32,11 @@ result.zip │ submission2-submission....json │ submission2-submissionN.json │ ... +│ +└───basecode +│ └───submissionId1.json +│ └───submissionId2.json +│ ... ``` The report zip contains @@ -41,20 +46,21 @@ The report zip contains - The `overview.json` encapsulates the main information from a JPlagResult such as base directory path, language, min- and max-metric, etc. The `overview.json` provides data to the `OverviewView.vue` that is first displayed after the report is dropped into the viewer. Corresponds to the Java record `OverviewReport`. - submissionFileIndex.json - - The `submissionFileIndex.json` stores a list of all files in the submission for each submission id. + - The `submissionFileIndex.json` stores a list of all files in the submission for each submission id. This file is also used to track the tokens per file. It is represented by a Map from the submission id to an instance of `SubmissionFile`. - options.json - - This File contains all options given to JPlag either over the CLI or programmatically + - This File contains all options given to JPlag either over the CLI or programmatically. It is represented diretly by the `JPlagOptions` class. - submissions - - This folder contains all files of all submissions JPlag was run with. For each submission the `submissions` folder contains a subfolder with the name of the corresponding submission id. A subfolder for a submission contains all files of said submission. These files are displayed in the `ComparisonView.vue` - comparison files - - For each submission pair submission1 submission2 with ids submissionId1 and submissionId2, the report contains either submissionId1-submissionId2.json or submissionId2-submissionId1.json. This file contains information the comparison between the two submissions, such as the similarity and concrete matches. Corresponds to the Java record `ComparisonReport`. +- base code + - Each JSON file in the `basecode` folder contains the data where the provided basecode was found in each submission. Each submission has its own file. If no basecode was provided, each file contains an empty array of matches. Each JSON file corresponds to an array the Java record `BaseCodeMatch`. + ## Submission ids ### Report Viewer @@ -89,5 +95,5 @@ Task: Adding the number of tokens in a match, which has to be displayed in the M 2. Modify the existing component `ComparisonReportWriter.java` to additionally extract the number of tokens in a match from the `JPlagResult.java` and save it in the Match DTO 3. Add `tokens: number` to `Match.ts` -4. Edit `ComparisonFactory.ts` to get the number of tokens from the JSON report file. [report-viewer] -5. Edit `MatchTable.vue` to display the tokens number in the `ComparisonView.vue`. +4. Edit `ComparisonFactory.ts` to get the number of tokens from the JSON report file. +5. Edit `MatchList.vue` to display the tokens number in the `ComparisonView.vue`. \ No newline at end of file From a76a69c8d7ac1c1419c55e6db727d94866edd7d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:08:58 +0000 Subject: [PATCH 15/22] Dependency(deps): Bump org.apache.maven.plugins:maven-gpg-plugin Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.2.5 to 3.2.6. - [Release notes](https://github.com/apache/maven-gpg-plugin/releases) - [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.2.5...maven-gpg-plugin-3.2.6) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-gpg-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8b347bb9e..5e4de1fb5 100644 --- a/pom.xml +++ b/pom.xml @@ -269,7 +269,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.5 + 3.2.6 org.apache.maven.plugins From 004b4c33078ffb9e35d2e8074b588c11e7f98ddb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 08:39:10 +0200 Subject: [PATCH 16/22] Dependency(deps-dev): Bump jsdom from 24.1.1 to 25.0.0 in /report-viewer (#1988) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- report-viewer/package-lock.json | 8 ++++---- report-viewer/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json index 514c32a7f..1ae73fda2 100644 --- a/report-viewer/package-lock.json +++ b/report-viewer/package-lock.json @@ -39,7 +39,7 @@ "autoprefixer": "^10.4.20", "eslint": "^8.57.0", "eslint-plugin-vue": "^9.27.0", - "jsdom": "^24.1.1", + "jsdom": "^25.0.0", "lint-staged": "^15.2.10", "npm-run-all": "^4.1.5", "postcss": "^8.4.45", @@ -4023,9 +4023,9 @@ } }, "node_modules/jsdom": { - "version": "24.1.1", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.1.1.tgz", - "integrity": "sha512-5O1wWV99Jhq4DV7rCLIoZ/UIhyQeDR7wHVyZAHAshbrvZsLs+Xzz7gtwnlJTJDjleiTKh54F4dXrX70vJQTyJQ==", + "version": "25.0.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-25.0.0.tgz", + "integrity": "sha512-OhoFVT59T7aEq75TVw9xxEfkXgacpqAhQaYgP9y/fDqWQCMB/b1H66RfmPm/MaeaAIU9nDwMOVTlPN51+ao6CQ==", "dev": true, "dependencies": { "cssstyle": "^4.0.1", diff --git a/report-viewer/package.json b/report-viewer/package.json index 00b7f9605..8e9f86c92 100644 --- a/report-viewer/package.json +++ b/report-viewer/package.json @@ -50,7 +50,7 @@ "autoprefixer": "^10.4.20", "eslint": "^8.57.0", "eslint-plugin-vue": "^9.27.0", - "jsdom": "^24.1.1", + "jsdom": "^25.0.0", "lint-staged": "^15.2.10", "npm-run-all": "^4.1.5", "postcss": "^8.4.45", From 44048dfe0635fd25378bc7cc8f04bcb17e816a91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 08:40:15 +0200 Subject: [PATCH 17/22] Dependency(deps-dev): Bump @playwright/test from 1.47.0 to 1.47.1 in /report-viewer (#1992) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- report-viewer/package-lock.json | 24 ++++++++++++------------ report-viewer/package.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json index 1ae73fda2..76406d45b 100644 --- a/report-viewer/package-lock.json +++ b/report-viewer/package-lock.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@pinia/testing": "^0.1.5", - "@playwright/test": "^1.47.0", + "@playwright/test": "^1.47.1", "@rushstack/eslint-patch": "^1.10.4", "@types/jsdom": "^21.1.7", "@types/node": "^22.5.3", @@ -881,12 +881,12 @@ } }, "node_modules/@playwright/test": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.47.0.tgz", - "integrity": "sha512-SgAdlSwYVpToI4e/IH19IHHWvoijAYH5hu2MWSXptRypLSnzj51PcGD+rsOXFayde4P9ZLi+loXVwArg6IUkCA==", + "version": "1.47.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.47.1.tgz", + "integrity": "sha512-dbWpcNQZ5nj16m+A5UNScYx7HX5trIy7g4phrcitn+Nk83S32EBX/CLU4hiF4RGKX/yRc93AAqtfaXB7JWBd4Q==", "dev": true, "dependencies": { - "playwright": "1.47.0" + "playwright": "1.47.1" }, "bin": { "playwright": "cli.js" @@ -5310,12 +5310,12 @@ } }, "node_modules/playwright": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.47.0.tgz", - "integrity": "sha512-jOWiRq2pdNAX/mwLiwFYnPHpEZ4rM+fRSQpRHwEwZlP2PUANvL3+aJOF/bvISMhFD30rqMxUB4RJx9aQbfh4Ww==", + "version": "1.47.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.47.1.tgz", + "integrity": "sha512-SUEKi6947IqYbKxRiqnbUobVZY4bF1uu+ZnZNJX9DfU1tlf2UhWfvVjLf01pQx9URsOr18bFVUKXmanYWhbfkw==", "dev": true, "dependencies": { - "playwright-core": "1.47.0" + "playwright-core": "1.47.1" }, "bin": { "playwright": "cli.js" @@ -5328,9 +5328,9 @@ } }, "node_modules/playwright-core": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.47.0.tgz", - "integrity": "sha512-1DyHT8OqkcfCkYUD9zzUTfg7EfTd+6a8MkD/NWOvjo0u/SCNd5YmY/lJwFvUZOxJbWNds+ei7ic2+R/cRz/PDg==", + "version": "1.47.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.47.1.tgz", + "integrity": "sha512-i1iyJdLftqtt51mEk6AhYFaAJCDx0xQ/O5NU8EKaWFgMjItPVma542Nh/Aq8aLCjIJSzjaiEQGW/nyqLkGF1OQ==", "dev": true, "bin": { "playwright-core": "cli.js" diff --git a/report-viewer/package.json b/report-viewer/package.json index 8e9f86c92..edaa1b90c 100644 --- a/report-viewer/package.json +++ b/report-viewer/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "@pinia/testing": "^0.1.5", - "@playwright/test": "^1.47.0", + "@playwright/test": "^1.47.1", "@rushstack/eslint-patch": "^1.10.4", "@types/jsdom": "^21.1.7", "@types/node": "^22.5.3", From 76a425ff517490fdfee873cc17496b3559f4c167 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 12:20:12 +0200 Subject: [PATCH 18/22] Dependency(deps-dev): Bump eslint-plugin-vue from 9.27.0 to 9.28.0 in /report-viewer (#1989) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- report-viewer/package-lock.json | 37 +++++++-------------------------- report-viewer/package.json | 2 +- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json index 76406d45b..1bef3621f 100644 --- a/report-viewer/package-lock.json +++ b/report-viewer/package-lock.json @@ -38,7 +38,7 @@ "@vue/tsconfig": "^0.5.1", "autoprefixer": "^10.4.20", "eslint": "^8.57.0", - "eslint-plugin-vue": "^9.27.0", + "eslint-plugin-vue": "^9.28.0", "jsdom": "^25.0.0", "lint-staged": "^15.2.10", "npm-run-all": "^4.1.5", @@ -2857,9 +2857,9 @@ } }, "node_modules/eslint-plugin-vue": { - "version": "9.27.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.27.0.tgz", - "integrity": "sha512-5Dw3yxEyuBSXTzT5/Ge1X5kIkRTQ3nvBn/VwPwInNiZBSJOO/timWMUaflONnFBzU6NhB68lxnCda7ULV5N7LA==", + "version": "9.28.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.28.0.tgz", + "integrity": "sha512-ShrihdjIhOTxs+MfWun6oJWuk+g/LAhN+CiuOl/jjkG3l0F2AuK5NMTaWqyvBgkFtpYmyks6P4603mLmhNJW8g==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", @@ -2867,7 +2867,7 @@ "natural-compare": "^1.4.0", "nth-check": "^2.1.1", "postcss-selector-parser": "^6.0.15", - "semver": "^7.6.0", + "semver": "^7.6.3", "vue-eslint-parser": "^9.4.3", "xml-name-validator": "^4.0.0" }, @@ -5993,13 +5993,10 @@ } }, "node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, "bin": { "semver": "bin/semver.js" }, @@ -6007,18 +6004,6 @@ "node": ">=10" } }, - "node_modules/semver/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/set-function-length": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.0.tgz", @@ -7442,12 +7427,6 @@ "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", "dev": true }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/yaml": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz", diff --git a/report-viewer/package.json b/report-viewer/package.json index edaa1b90c..62b566957 100644 --- a/report-viewer/package.json +++ b/report-viewer/package.json @@ -49,7 +49,7 @@ "@vue/tsconfig": "^0.5.1", "autoprefixer": "^10.4.20", "eslint": "^8.57.0", - "eslint-plugin-vue": "^9.27.0", + "eslint-plugin-vue": "^9.28.0", "jsdom": "^25.0.0", "lint-staged": "^15.2.10", "npm-run-all": "^4.1.5", From 7ba1ab5f1163a2547c2d14f207848a727c08d598 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 12:24:09 +0200 Subject: [PATCH 19/22] Dependency(deps-dev): Bump @vitejs/plugin-vue from 5.1.3 to 5.1.4 in /report-viewer (#1990) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- report-viewer/package-lock.json | 8 ++++---- report-viewer/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json index 1bef3621f..dbc17faaf 100644 --- a/report-viewer/package-lock.json +++ b/report-viewer/package-lock.json @@ -31,7 +31,7 @@ "@rushstack/eslint-patch": "^1.10.4", "@types/jsdom": "^21.1.7", "@types/node": "^22.5.3", - "@vitejs/plugin-vue": "^5.1.3", + "@vitejs/plugin-vue": "^5.1.4", "@vue/eslint-config-prettier": "^9.0.0", "@vue/eslint-config-typescript": "^13.0.0", "@vue/test-utils": "^2.4.6", @@ -1360,9 +1360,9 @@ "dev": true }, "node_modules/@vitejs/plugin-vue": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.1.3.tgz", - "integrity": "sha512-3xbWsKEKXYlmX82aOHufFQVnkbMC/v8fLpWwh6hWOUrK5fbbtBh9Q/WWse27BFgSy2/e2c0fz5Scgya9h2GLhw==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.1.4.tgz", + "integrity": "sha512-N2XSI2n3sQqp5w7Y/AN/L2XDjBIRGqXko+eDp42sydYSBeJuSm5a1sLf8zakmo8u7tA8NmBgoDLA1HeOESjp9A==", "dev": true, "engines": { "node": "^18.0.0 || >=20.0.0" diff --git a/report-viewer/package.json b/report-viewer/package.json index 62b566957..b5de70982 100644 --- a/report-viewer/package.json +++ b/report-viewer/package.json @@ -42,7 +42,7 @@ "@rushstack/eslint-patch": "^1.10.4", "@types/jsdom": "^21.1.7", "@types/node": "^22.5.3", - "@vitejs/plugin-vue": "^5.1.3", + "@vitejs/plugin-vue": "^5.1.4", "@vue/eslint-config-prettier": "^9.0.0", "@vue/eslint-config-typescript": "^13.0.0", "@vue/test-utils": "^2.4.6", From 383b2c87a8dc880e6b3e9c7e085c017966bf127a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 13:14:15 +0200 Subject: [PATCH 20/22] Dependency(deps): Bump vue-router from 4.4.4 to 4.4.5 in /report-viewer (#1991) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- report-viewer/package-lock.json | 8 ++++---- report-viewer/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json index dbc17faaf..25956eb00 100644 --- a/report-viewer/package-lock.json +++ b/report-viewer/package-lock.json @@ -22,7 +22,7 @@ "vue": "^3.4.38", "vue-chartjs": "^5.3.1", "vue-draggable-next": "^2.2.1", - "vue-router": "^4.4.4", + "vue-router": "^4.4.5", "vue-virtual-scroller": "^2.0.0-beta.8" }, "devDependencies": { @@ -7109,9 +7109,9 @@ } }, "node_modules/vue-router": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.4.4.tgz", - "integrity": "sha512-3MlnDqwRwZwCQVbtVfpsU+nrNymNjnXSsQtXName5925NVC1+326VVfYH9vSrA0N13teGEo8z5x7gbRnGjCDiQ==", + "version": "4.4.5", + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.4.5.tgz", + "integrity": "sha512-4fKZygS8cH1yCyuabAXGUAsyi1b2/o/OKgu/RUb+znIYOxPRxdkytJEx+0wGcpBE1pX6vUgh5jwWOKRGvuA/7Q==", "dependencies": { "@vue/devtools-api": "^6.6.4" }, diff --git a/report-viewer/package.json b/report-viewer/package.json index b5de70982..1f9474403 100644 --- a/report-viewer/package.json +++ b/report-viewer/package.json @@ -33,7 +33,7 @@ "vue": "^3.4.38", "vue-chartjs": "^5.3.1", "vue-draggable-next": "^2.2.1", - "vue-router": "^4.4.4", + "vue-router": "^4.4.5", "vue-virtual-scroller": "^2.0.0-beta.8" }, "devDependencies": { From 034e63a66e345a0479d4c6a01b71f8da61bd09f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Sa=C4=9Flam?= Date: Sun, 22 Sep 2024 15:46:07 +0200 Subject: [PATCH 21/22] Update docs/6.-Report-File-Generation.md --- docs/6.-Report-File-Generation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/6.-Report-File-Generation.md b/docs/6.-Report-File-Generation.md index 3d1fd24d6..a251c2a5c 100644 --- a/docs/6.-Report-File-Generation.md +++ b/docs/6.-Report-File-Generation.md @@ -49,7 +49,7 @@ The report zip contains - The `submissionFileIndex.json` stores a list of all files in the submission for each submission id. This file is also used to track the tokens per file. It is represented by a Map from the submission id to an instance of `SubmissionFile`. - options.json - - This File contains all options given to JPlag either over the CLI or programmatically. It is represented diretly by the `JPlagOptions` class. + - This File contains all options given to JPlag either over the CLI or programmatically. It is represented directly by the `JPlagOptions` class. - submissions - This folder contains all files of all submissions JPlag was run with. For each submission the `submissions` folder contains a subfolder with the name of the corresponding submission id. A subfolder for a submission contains all files of said submission. From 099b96638aff301ad8387dfe017cd6b2740e8b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Sa=C4=9Flam?= Date: Sun, 22 Sep 2024 15:46:24 +0200 Subject: [PATCH 22/22] Update docs/6.-Report-File-Generation.md --- docs/6.-Report-File-Generation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/6.-Report-File-Generation.md b/docs/6.-Report-File-Generation.md index a251c2a5c..27f8178c7 100644 --- a/docs/6.-Report-File-Generation.md +++ b/docs/6.-Report-File-Generation.md @@ -59,7 +59,7 @@ The report zip contains - For each submission pair submission1 submission2 with ids submissionId1 and submissionId2, the report contains either submissionId1-submissionId2.json or submissionId2-submissionId1.json. This file contains information the comparison between the two submissions, such as the similarity and concrete matches. Corresponds to the Java record `ComparisonReport`. - base code - - Each JSON file in the `basecode` folder contains the data where the provided basecode was found in each submission. Each submission has its own file. If no basecode was provided, each file contains an empty array of matches. Each JSON file corresponds to an array the Java record `BaseCodeMatch`. + - Each JSON file in the `basecode` folder contains the data where the provided basecode was found in each submission. Each submission has its own file. If no basecode was provided, each file contains an empty array of matches. Each JSON file corresponds to an array of the Java record `BaseCodeMatch`. ## Submission ids