This cluster has no members.
@@ -23,67 +19,65 @@
\ No newline at end of file
+
diff --git a/report-viewer/src/components/ErrorRouter.vue b/report-viewer/src/components/ErrorRouter.vue
index 7f0b3e4ba..bcc08bbb3 100644
--- a/report-viewer/src/components/ErrorRouter.vue
+++ b/report-viewer/src/components/ErrorRouter.vue
@@ -1,28 +1,28 @@
- {{routerInfo}}
+ {{ routerInfo }}
-
@@ -36,6 +36,6 @@ export default {
color: #fff;
text-align: center;
display: inline-block;
- border-radius: 2px
+ border-radius: 2px;
}
-
\ No newline at end of file
+
diff --git a/report-viewer/src/components/FilesContainer.vue b/report-viewer/src/components/FilesContainer.vue
index 5eae74f34..ca25290bf 100644
--- a/report-viewer/src/components/FilesContainer.vue
+++ b/report-viewer/src/components/FilesContainer.vue
@@ -10,7 +10,7 @@
:key="file.concat(index.toString())"
:collapse="files.get(file)?.collapsed"
:file-index="index"
- :lines="!files.get(file)?.lines ? [] : files.get(file)?.lines"
+ :lines="files.get(file)?.lines || []"
:matches="!matches.get(file) ? [] : matches.get(file)"
:panel-id="containerId"
:title="convertSubmissionIdToName(file, submissionId)"
@@ -23,15 +23,16 @@
\ No newline at end of file
+
diff --git a/report-viewer/src/components/LineOfCode.vue b/report-viewer/src/components/LineOfCode.vue
index eb530102c..0d662e6b5 100644
--- a/report-viewer/src/components/LineOfCode.vue
+++ b/report-viewer/src/components/LineOfCode.vue
@@ -2,20 +2,23 @@
Container which display a single line of code of a file.
-->
-
-
{{ lineNumber }} {{
- text
- }}
+
+
{{ lineNumber }} {{ text }}
-
\ No newline at end of file
+
diff --git a/report-viewer/src/main.ts b/report-viewer/src/main.ts
index b67d365b9..878da2a5a 100644
--- a/report-viewer/src/main.ts
+++ b/report-viewer/src/main.ts
@@ -1,12 +1,19 @@
-import {createApp} from "vue";
-import App from "./App.vue";
-import router from "./router";
-import store from "./store/store"
-import VueVirtualScroller from "vue-virtual-scroller"
+import { createApp } from 'vue'
+import { createPinia } from 'pinia'
+
+import App from './App.vue'
+import router from './router'
+import VueVirtualScroller from 'vue-virtual-scroller'
+import 'highlight.js/lib/common'
+
import 'highlight.js/styles/vs.css'
import 'gitart-vue-dialog/dist/style.css'
-import 'highlight.js/lib/common';
-import 'vue-virtual-scroller/dist/vue-virtual-scroller.css';
+import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
+
+const app = createApp(App)
+app.use(createPinia())
+app.use(router)
+app.use(VueVirtualScroller)
-createApp(App).use(router).use(store).use(VueVirtualScroller).mount("#app");
+app.mount('#app')
diff --git a/report-viewer/src/model/Cluster.ts b/report-viewer/src/model/Cluster.ts
index 77e297a0a..7e57c6485 100644
--- a/report-viewer/src/model/Cluster.ts
+++ b/report-viewer/src/model/Cluster.ts
@@ -1,5 +1,5 @@
export type Cluster = {
- averageSimilarity: number,
- strength: number,
- members: Array
-}
\ No newline at end of file
+ averageSimilarity: number
+ strength: number
+ members: Array
+}
diff --git a/report-viewer/src/model/ClusterListElement.ts b/report-viewer/src/model/ClusterListElement.ts
index 1b36f58b9..0763d7f25 100644
--- a/report-viewer/src/model/ClusterListElement.ts
+++ b/report-viewer/src/model/ClusterListElement.ts
@@ -1,10 +1,7 @@
type ClusterListElement = {
- averageSimilarity: number;
- strength: number;
- members: ClusterListElementMember;
-};
-type ClusterListElementMember = Map<
- string,
- Array<{ matchedWith: string; percentage: number }>
->;
-export { ClusterListElement, ClusterListElementMember };
+ averageSimilarity: number
+ strength: number
+ members: ClusterListElementMember
+}
+type ClusterListElementMember = Map>
+export type { ClusterListElement, ClusterListElementMember }
diff --git a/report-viewer/src/model/Comparison.ts b/report-viewer/src/model/Comparison.ts
index 1007dc847..8b6d82beb 100644
--- a/report-viewer/src/model/Comparison.ts
+++ b/report-viewer/src/model/Comparison.ts
@@ -1,100 +1,96 @@
-import { Match } from "./Match";
-import { SubmissionFile } from "./SubmissionFile";
-import { MatchInSingleFile } from "./MatchInSingleFile";
+import type { Match } from './Match'
+import type { SubmissionFile } from './SubmissionFile'
+import type { MatchInSingleFile } from './MatchInSingleFile'
/**
* Comparison model used by the ComparisonView
*/
export class Comparison {
- private readonly _firstSubmissionId: string;
- private readonly _secondSubmissionId: string;
- private readonly _similarity: number;
-
- constructor(
- firstSubmissionId: string,
- secondSubmissionId: string,
- similarity: number
- ) {
- this._firstSubmissionId = firstSubmissionId;
- this._secondSubmissionId = secondSubmissionId;
- this._similarity = similarity;
- this._filesOfFirstSubmission = new Map();
- this._filesOfSecondSubmission = new Map();
- this._colors = [];
- this._allMatches = [];
- this._matchesInFirstSubmission = new Map();
- this._matchesInSecondSubmissions = new Map();
- }
-
- private _filesOfFirstSubmission: Map;
+ private readonly _firstSubmissionId: string
+ private readonly _secondSubmissionId: string
+ private readonly _similarity: number
+
+ constructor(firstSubmissionId: string, secondSubmissionId: string, similarity: number) {
+ this._firstSubmissionId = firstSubmissionId
+ this._secondSubmissionId = secondSubmissionId
+ this._similarity = similarity
+ this._filesOfFirstSubmission = new Map()
+ this._filesOfSecondSubmission = new Map()
+ this._colors = []
+ this._allMatches = []
+ this._matchesInFirstSubmission = new Map()
+ this._matchesInSecondSubmissions = new Map()
+ }
+
+ private _filesOfFirstSubmission: Map
get filesOfFirstSubmission(): Map {
- return this._filesOfFirstSubmission;
+ return this._filesOfFirstSubmission
}
set filesOfFirstSubmission(value: Map) {
- this._filesOfFirstSubmission = value;
+ this._filesOfFirstSubmission = value
}
- private _filesOfSecondSubmission: Map;
+ private _filesOfSecondSubmission: Map
get filesOfSecondSubmission(): Map {
- return this._filesOfSecondSubmission;
+ return this._filesOfSecondSubmission
}
set filesOfSecondSubmission(value: Map) {
- this._filesOfSecondSubmission = value;
+ this._filesOfSecondSubmission = value
}
- private _colors: Array;
+ private _colors: Array
get colors(): Array {
- return this._colors;
+ return this._colors
}
set colors(value: Array) {
- this._colors = value;
+ this._colors = value
}
- private _allMatches: Array;
+ private _allMatches: Array
get allMatches(): Array {
- return this._allMatches;
+ return this._allMatches
}
set allMatches(value: Array) {
- this._allMatches = value;
+ this._allMatches = value
}
- private _matchesInFirstSubmission: Map>;
+ private _matchesInFirstSubmission: Map>
get matchesInFirstSubmission(): Map> {
- return this._matchesInFirstSubmission;
+ return this._matchesInFirstSubmission
}
set matchesInFirstSubmission(value: Map>) {
- this._matchesInFirstSubmission = value;
+ this._matchesInFirstSubmission = value
}
- private _matchesInSecondSubmissions: Map>;
+ private _matchesInSecondSubmissions: Map>
get matchesInSecondSubmissions(): Map> {
- return this._matchesInSecondSubmissions;
+ return this._matchesInSecondSubmissions
}
set matchesInSecondSubmissions(value: Map>) {
- this._matchesInSecondSubmissions = value;
+ this._matchesInSecondSubmissions = value
}
get firstSubmissionId(): string {
- return this._firstSubmissionId;
+ return this._firstSubmissionId
}
get secondSubmissionId(): string {
- return this._secondSubmissionId;
+ return this._secondSubmissionId
}
get similarity(): number {
- return this._similarity;
+ return this._similarity
}
}
diff --git a/report-viewer/src/model/ComparisonListElement.ts b/report-viewer/src/model/ComparisonListElement.ts
index e3ca29778..a1d795fb8 100644
--- a/report-viewer/src/model/ComparisonListElement.ts
+++ b/report-viewer/src/model/ComparisonListElement.ts
@@ -3,8 +3,8 @@
* For full comparison model see Comparison.ts
*/
export type ComparisonListElement = {
- id: number,
- firstSubmissionId: string,
- secondSubmissionId: string,
- similarity: number
-}
\ No newline at end of file
+ id: number
+ firstSubmissionId: string
+ secondSubmissionId: string
+ similarity: number
+}
diff --git a/report-viewer/src/model/Match.ts b/report-viewer/src/model/Match.ts
index 86be0d3b4..5892a5bd2 100644
--- a/report-viewer/src/model/Match.ts
+++ b/report-viewer/src/model/Match.ts
@@ -2,12 +2,12 @@
* Match between two files of two submissions.
*/
export type Match = {
- firstFile: string,
- secondFile: string,
- startInFirst: number,
- endInFirst: number,
- startInSecond: number,
- endInSecond: number,
- tokens: number,
- color: string
-}
\ No newline at end of file
+ firstFile: string
+ secondFile: string
+ startInFirst: number
+ endInFirst: number
+ startInSecond: number
+ endInSecond: number
+ tokens: number
+ color: string
+}
diff --git a/report-viewer/src/model/MatchInSingleFile.ts b/report-viewer/src/model/MatchInSingleFile.ts
index dc95b2c19..8e7810625 100644
--- a/report-viewer/src/model/MatchInSingleFile.ts
+++ b/report-viewer/src/model/MatchInSingleFile.ts
@@ -2,19 +2,19 @@
* Describes a match in a single file.
*/
export type MatchInSingleFile = {
- start: number,
- end: number,
- /**
- * The files container containing the file of the second submission to which this is matched.
- */
- linked_panel: number,
- /**
- * The file name containing the same match in the second submission.
- */
- linked_file: string,
- /**
- * The start of the match in the second file.
- */
- linked_line: number,
- color: string
-}
\ No newline at end of file
+ start: number
+ end: number
+ /**
+ * The files container containing the file of the second submission to which this is matched.
+ */
+ linked_panel: number
+ /**
+ * The file name containing the same match in the second submission.
+ */
+ linked_file: string
+ /**
+ * The start of the match in the second file.
+ */
+ linked_line: number
+ color: string
+}
diff --git a/report-viewer/src/model/Metric.ts b/report-viewer/src/model/Metric.ts
index 97e80452b..b7f2a218f 100644
--- a/report-viewer/src/model/Metric.ts
+++ b/report-viewer/src/model/Metric.ts
@@ -1,12 +1,12 @@
-import {ComparisonListElement} from "./ComparisonListElement";
+import type { ComparisonListElement } from './ComparisonListElement'
/**
* Metric used in the Jplag Comparison
*/
export type Metric = {
- metricName: string,
- description: string,
- metricThreshold: number,
- distribution: Array,
- comparisons: Array
-}
\ No newline at end of file
+ metricName: string
+ description: string
+ metricThreshold: number
+ distribution: Array
+ comparisons: Array
+}
diff --git a/report-viewer/src/model/Overview.ts b/report-viewer/src/model/Overview.ts
index 98984164a..317682162 100644
--- a/report-viewer/src/model/Overview.ts
+++ b/report-viewer/src/model/Overview.ts
@@ -1,18 +1,18 @@
-import { Metric } from "./Metric";
-import { Cluster } from "@/model/Cluster";
+import type { Metric } from './Metric'
+import type { Cluster } from '@/model/Cluster'
export class Overview {
- private readonly _submissionFolderPath: Array;
- private readonly _baseCodeFolderPath: string;
- private readonly _language: string;
- private readonly _fileExtensions: Array;
- private readonly _matchSensitivity: number;
- private readonly _submissionIdsToComparisonFileName: Map>;
- private readonly _dateOfExecution: string;
- private readonly _durationOfExecution: number;
- private readonly _metrics: Array;
- private readonly _clusters: Array;
- private readonly _totalComparisons: number;
+ private readonly _submissionFolderPath: Array
+ private readonly _baseCodeFolderPath: string
+ private readonly _language: string
+ private readonly _fileExtensions: Array
+ private readonly _matchSensitivity: number
+ private readonly _submissionIdsToComparisonFileName: Map>
+ private readonly _dateOfExecution: string
+ private readonly _durationOfExecution: number
+ private readonly _metrics: Array
+ private readonly _clusters: Array
+ private readonly _totalComparisons: number
constructor(
submissionFolderPath: Array,
@@ -25,62 +25,61 @@ export class Overview {
metrics: Array,
clusters: Array,
totalComparisons: number,
- submissionIdsToComparisonFileName: Map>
+ submissionIdsToComparisonFileName: Map>
) {
- this._submissionFolderPath = submissionFolderPath;
- this._baseCodeFolderPath = baseCodeFolderPath;
- this._language = language;
- this._fileExtensions = fileExtensions;
- this._matchSensitivity = matchSensitivity;
- this._dateOfExecution = dateOfExecution;
- this._durationOfExecution = durationOfExecution;
- this._metrics = metrics;
- this._clusters = clusters;
- this. _submissionIdsToComparisonFileName = submissionIdsToComparisonFileName;
- this._totalComparisons= totalComparisons;
+ this._submissionFolderPath = submissionFolderPath
+ this._baseCodeFolderPath = baseCodeFolderPath
+ this._language = language
+ this._fileExtensions = fileExtensions
+ this._matchSensitivity = matchSensitivity
+ this._dateOfExecution = dateOfExecution
+ this._durationOfExecution = durationOfExecution
+ this._metrics = metrics
+ this._clusters = clusters
+ this._submissionIdsToComparisonFileName = submissionIdsToComparisonFileName
+ this._totalComparisons = totalComparisons
}
- get submissionIdsToComparisonFileName(): Map> {
- return this.submissionIdsToComparisonFileName;
+ get submissionIdsToComparisonFileName(): Map> {
+ return this.submissionIdsToComparisonFileName
}
get submissionFolderPath(): Array {
- return this._submissionFolderPath;
+ return this._submissionFolderPath
}
get baseCodeFolderPath(): string {
- return this._baseCodeFolderPath;
+ return this._baseCodeFolderPath
}
get language(): string {
- return this._language;
+ return this._language
}
get fileExtensions(): Array {
- return this._fileExtensions;
+ return this._fileExtensions
}
get matchSensitivity(): number {
- return this._matchSensitivity;
+ return this._matchSensitivity
}
-
get dateOfExecution(): string {
- return this._dateOfExecution;
+ return this._dateOfExecution
}
get durationOfExecution(): number {
- return this._durationOfExecution;
+ return this._durationOfExecution
}
get metrics(): Array {
- return this._metrics;
+ return this._metrics
}
get clusters(): Array {
- return this._clusters;
+ return this._clusters
}
get totalComparisons(): number {
- return this._totalComparisons;
+ return this._totalComparisons
}
}
diff --git a/report-viewer/src/model/SubmissionFile.ts b/report-viewer/src/model/SubmissionFile.ts
index b9cf43a46..182c9297e 100644
--- a/report-viewer/src/model/SubmissionFile.ts
+++ b/report-viewer/src/model/SubmissionFile.ts
@@ -1,10 +1,10 @@
export type SubmissionFile = {
- /**
- * Code lines of the file.
- */
- lines: Array;
- /**
- * Indicates whether the file is displayed or not.
- */
- collapsed: boolean;
-}
\ No newline at end of file
+ /**
+ * Code lines of the file.
+ */
+ lines: Array
+ /**
+ * Indicates whether the file is displayed or not.
+ */
+ collapsed: boolean
+}
diff --git a/report-viewer/src/model/Version.ts b/report-viewer/src/model/Version.ts
index 5d796f7a6..236164c95 100644
--- a/report-viewer/src/model/Version.ts
+++ b/report-viewer/src/model/Version.ts
@@ -1,5 +1,5 @@
export type Version = {
- major: number,
- minor: number,
- patch: number
-}
\ No newline at end of file
+ major: number
+ minor: number
+ patch: number
+}
diff --git a/report-viewer/src/model/factories/ComparisonFactory.ts b/report-viewer/src/model/factories/ComparisonFactory.ts
index 90353d326..84f4fd086 100644
--- a/report-viewer/src/model/factories/ComparisonFactory.ts
+++ b/report-viewer/src/model/factories/ComparisonFactory.ts
@@ -1,81 +1,69 @@
-import { Comparison } from "../Comparison";
-import { Match } from "../Match";
-import { SubmissionFile } from "../SubmissionFile";
-import { MatchInSingleFile } from "../MatchInSingleFile";
-import store from "@/store/store";
+import { Comparison } from '../Comparison'
+import type { Match } from '../Match'
+import type { SubmissionFile } from '../SubmissionFile'
+import type { MatchInSingleFile } from '../MatchInSingleFile'
+import store from '@/stores/store'
export class ComparisonFactory {
static getComparison(json: Record): Comparison {
- const filesOfFirstSubmission = store.getters.filesOfSubmission(
- json.id1
- );
- const filesOfSecondSubmission = store.getters.filesOfSubmission(
- json.id2
- );
+ const filesOfFirstSubmission = store().filesOfSubmission(json.id1 as string)
+ const filesOfSecondSubmission = store().filesOfSubmission(json.id2 as string)
- const filesOfFirstConverted = this.convertToFilesByName(
- filesOfFirstSubmission
- );
- const filesOfSecondConverted = this.convertToFilesByName(
- filesOfSecondSubmission
- );
+ const filesOfFirstConverted = this.convertToFilesByName(filesOfFirstSubmission)
+ const filesOfSecondConverted = this.convertToFilesByName(filesOfSecondSubmission)
- const matches = json.matches as Array>;
+ const matches = json.matches as Array>
+ const colors = this.generateColorsForMatches(matches.length)
+ const coloredMatches = matches.map((match, index) => this.mapMatch(match, colors[index]))
- const colors = this.generateColorsForMatches(matches.length);
- const coloredMatches = matches.map((match, index) =>
- this.mapMatch(match, colors[index])
- );
-
- const matchesInFirst = this.groupMatchesByFileName(coloredMatches, 1);
- const matchesInSecond = this.groupMatchesByFileName(coloredMatches, 2);
+ const matchesInFirst = this.groupMatchesByFileName(coloredMatches, 1)
+ const matchesInSecond = this.groupMatchesByFileName(coloredMatches, 2)
const comparison = new Comparison(
json.id1 as string,
json.id2 as string,
json.similarity as number
- );
- comparison.filesOfFirstSubmission = filesOfFirstConverted;
- comparison.filesOfSecondSubmission = filesOfSecondConverted;
- comparison.colors = colors;
- comparison.allMatches = coloredMatches;
- comparison.matchesInFirstSubmission = matchesInFirst;
- comparison.matchesInSecondSubmissions = matchesInSecond;
-
- return comparison;
+ )
+ comparison.filesOfFirstSubmission = filesOfFirstConverted
+ comparison.filesOfSecondSubmission = filesOfSecondConverted
+ comparison.colors = colors
+ comparison.allMatches = coloredMatches
+ comparison.matchesInFirstSubmission = matchesInFirst
+ comparison.matchesInSecondSubmissions = matchesInSecond
+
+ return comparison
}
private static convertToFilesByName(
files: Array<{ name: string; value: string }>
): Map {
- const map = new Map();
+ const map = new Map()
files.forEach((val) => {
if (!map.get(val.name)) {
map.set(val.name as string, {
lines: [],
- collapsed: false,
- });
+ collapsed: false
+ })
}
map.set(val.name as string, {
lines: val.value.split(/\r?\n/),
- collapsed: false,
- });
- });
- return map;
+ collapsed: false
+ })
+ })
+ return map
}
private static groupMatchesByFileName(
matches: Array,
index: number
): Map> {
- const acc = new Map>();
+ const acc = new Map>()
matches.forEach((val) => {
- const name =
- index === 1 ? (val.firstFile as string) : (val.secondFile as string);
+ const name = index === 1 ? (val.firstFile as string) : (val.secondFile as string)
if (!acc.get(name)) {
- acc.set(name, []);
+ acc.set(name, [])
}
if (index === 1) {
@@ -85,9 +73,9 @@ export class ComparisonFactory {
linked_panel: 2,
linked_file: val.secondFile as string,
linked_line: val.startInSecond as number,
- color: val.color as string,
- };
- acc.get(name)?.push(newVal);
+ color: val.color as string
+ }
+ acc.get(name)?.push(newVal)
} else {
const newVal: MatchInSingleFile = {
start: val.startInSecond as number,
@@ -95,37 +83,38 @@ export class ComparisonFactory {
linked_panel: 1,
linked_file: val.firstFile as string,
linked_line: val.startInFirst as number,
- color: val.color as string,
- };
- acc.get(name)?.push(newVal);
+ color: val.color as string
+ }
+ acc.get(name)?.push(newVal)
}
- });
- return acc;
+ })
+ return acc
}
-
private static generateColorsForMatches(num: number): Array {
- const colors: Array = [];
- const numberOfColorsInFirstInterval = Math.round((80 - 20) / ((80 - 20) + (340 - 160)) * num); // number of colors from the first interval
- const numberOfColorsInSecondInterval = num - numberOfColorsInFirstInterval; // number of colors from the second interval
- ComparisonFactory.generateColorsForInterval(20, 80, numberOfColorsInFirstInterval, colors);
- ComparisonFactory.generateColorsForInterval(160, 340, numberOfColorsInSecondInterval, colors);
- return colors;
+ const colors: Array = []
+ const numberOfColorsInFirstInterval = Math.round(((80 - 20) / (80 - 20 + (340 - 160))) * num) // number of colors from the first interval
+ const numberOfColorsInSecondInterval = num - numberOfColorsInFirstInterval // number of colors from the second interval
+ ComparisonFactory.generateColorsForInterval(20, 80, numberOfColorsInFirstInterval, colors)
+ ComparisonFactory.generateColorsForInterval(160, 340, numberOfColorsInSecondInterval, colors)
+ return colors
}
- private static generateColorsForInterval(intervalStart: number, intervalEnd: number, numberOfColorsInInterval: number, colors: Array){
- const interval = intervalEnd - intervalStart;
- const hueDelta = Math.trunc(interval / numberOfColorsInInterval);
+ private static generateColorsForInterval(
+ intervalStart: number,
+ intervalEnd: number,
+ numberOfColorsInInterval: number,
+ colors: Array
+ ) {
+ const interval = intervalEnd - intervalStart
+ const hueDelta = Math.trunc(interval / numberOfColorsInInterval)
for (let i = 0; i < numberOfColorsInInterval; i++) {
- const hue = intervalStart + i * hueDelta;
- colors.push(`hsla(${hue}, 80%, 50%, 0.3)`);
+ const hue = intervalStart + i * hueDelta
+ colors.push(`hsla(${hue}, 80%, 50%, 0.3)`)
}
}
- private static mapMatch(
- match: Record,
- color: string
- ): Match {
+ private static mapMatch(match: Record, color: string): Match {
return {
firstFile: match.file1 as string,
secondFile: match.file2 as string,
@@ -134,7 +123,7 @@ export class ComparisonFactory {
startInSecond: match.start2 as number,
endInSecond: match.end2 as number,
tokens: match.tokens as number,
- color: color,
- };
+ color: color
+ }
}
}
diff --git a/report-viewer/src/model/factories/OverviewFactory.ts b/report-viewer/src/model/factories/OverviewFactory.ts
index bae450d06..25f2b0870 100644
--- a/report-viewer/src/model/factories/OverviewFactory.ts
+++ b/report-viewer/src/model/factories/OverviewFactory.ts
@@ -1,74 +1,76 @@
-import { Overview } from "../Overview";
-import { Metric } from "../Metric";
-import { ComparisonListElement } from "../ComparisonListElement";
-import { Cluster } from "@/model/Cluster";
-import store from "@/store/store";
-import { Version } from "../Version";
-import versionJson from "../../version.json";
+import { Overview } from '../Overview'
+import type { Metric } from '../Metric'
+import type { ComparisonListElement } from '../ComparisonListElement'
+import type { Cluster } from '@/model/Cluster'
+import store from '@/stores/store'
+import type { Version } from '../Version'
+import versionJson from '@/version.json'
export class OverviewFactory {
-
- static reportViewerVersion: Version = versionJson["report_viewer_version"] !== undefined ? versionJson["report_viewer_version"] : {major: -1, minor: -1, patch: -1};
+ static reportViewerVersion: Version =
+ versionJson['report_viewer_version'] !== undefined
+ ? versionJson['report_viewer_version']
+ : { major: -1, minor: -1, patch: -1 }
static getOverview(json: Record): Overview {
- const versionField = json.jplag_version as Record;
+ const versionField = json.jplag_version as Record
const jplagVersion: Version = {
major: versionField.major,
minor: versionField.minor,
patch: versionField.patch
}
- OverviewFactory.compareVersions(jplagVersion, this.reportViewerVersion);
+ OverviewFactory.compareVersions(jplagVersion, this.reportViewerVersion)
- const submissionFolder = json.submission_folder_path as Array;
- const baseCodeFolder = "";
- const language = json.language as string;
- const fileExtensions = json.file_extensions as Array;
- const matchSensitivity = json.match_sensitivity as number;
- const jsonSubmissions = json.submission_id_to_display_name as Map;
- const map = new Map(Object.entries(jsonSubmissions));
- const dateOfExecution = json.date_of_execution as string;
- const duration = json.execution_time as number as number;
- const metrics = [] as Array;
- const clusters = [] as Array;
- const totalComparisons= json.total_comparisons as number;
- (json.metrics as Array).forEach((jsonMetric) => {
- const metric = jsonMetric as Record;
- const comparisons = [] as Array;
+ const submissionFolder = json.submission_folder_path as Array
+ const baseCodeFolder = ''
+ const language = json.language as string
+ const fileExtensions = json.file_extensions as Array
+ const matchSensitivity = json.match_sensitivity as number
+ const jsonSubmissions = json.submission_id_to_display_name as Map
+ const map = new Map(Object.entries(jsonSubmissions))
+ const dateOfExecution = json.date_of_execution as string
+ const duration = json.execution_time as number as number
+ const metrics = [] as Array
+ const clusters = [] as Array
+ const totalComparisons = json.total_comparisons as number
+ ;(json.metrics as Array).forEach((jsonMetric) => {
+ const metric = jsonMetric as Record
+ const comparisons = [] as Array
- (metric.topComparisons as Array>).forEach(
- (jsonComparison,index) => {
+ ;(metric.topComparisons as Array>).forEach(
+ (jsonComparison, index) => {
const comparison: ComparisonListElement = {
- id: index + 1 as number,
+ id: (index + 1) as number,
firstSubmissionId: jsonComparison.first_submission as string,
secondSubmissionId: jsonComparison.second_submission as string,
- similarity: jsonComparison.similarity as number,
- };
- comparisons.push(comparison);
+ similarity: jsonComparison.similarity as number
+ }
+ comparisons.push(comparison)
}
- );
+ )
metrics.push({
metricName: metric.name as string,
metricThreshold: metric.threshold as number,
distribution: metric.distribution as Array,
comparisons: comparisons,
- description: metric.description as string,
- });
- });
- store.commit("saveSubmissionNames", map);
+ description: metric.description as string
+ })
+ })
+ store().saveSubmissionNames(map)
if (json.clusters) {
- (json.clusters as Array).forEach((jsonCluster) => {
- const cluster = jsonCluster as Record;
+ ;(json.clusters as Array).forEach((jsonCluster) => {
+ const cluster = jsonCluster as Record
const newCluster: Cluster = {
averageSimilarity: cluster.average_similarity as number,
strength: cluster.strength as number,
- members: cluster.members as Array,
- };
- clusters.push(newCluster);
- });
+ members: cluster.members as Array
+ }
+ clusters.push(newCluster)
+ })
}
-
- OverviewFactory.saveSubmissionsToComparisonNameMap(json);
+
+ OverviewFactory.saveSubmissionsToComparisonNameMap(json)
return new Overview(
submissionFolder,
baseCodeFolder,
@@ -81,47 +83,70 @@ export class OverviewFactory {
clusters,
totalComparisons,
new Map()
- );
+ )
}
static compareVersions(jsonVersion: Version, reportViewerVersion: Version) {
- if(sessionStorage.getItem("versionAlert")===null) {
-
- if (reportViewerVersion.major === 0 && reportViewerVersion.minor === 0 && reportViewerVersion.patch === 0) {
- alert("The development version (0.0.0) of JPlag is used.");
+ if (sessionStorage.getItem('versionAlert') === null) {
+ if (
+ reportViewerVersion.major === 0 &&
+ reportViewerVersion.minor === 0 &&
+ reportViewerVersion.patch === 0
+ ) {
+ alert('The development version (0.0.0) of JPlag is used.')
}
- if (jsonVersion.major !== reportViewerVersion.major ||
- jsonVersion.minor !== reportViewerVersion.minor ||
- jsonVersion.patch !== reportViewerVersion.patch) {
- if(reportViewerVersion.major === -1 && reportViewerVersion.minor === -1 && reportViewerVersion.patch === -1){
- console.warn("The report viewer's version cannot be read from version.json file. Please configure it correctly.");
+ if (
+ jsonVersion.major !== reportViewerVersion.major ||
+ jsonVersion.minor !== reportViewerVersion.minor ||
+ jsonVersion.patch !== reportViewerVersion.patch
+ ) {
+ if (
+ reportViewerVersion.major === -1 &&
+ reportViewerVersion.minor === -1 &&
+ reportViewerVersion.patch === -1
+ ) {
+ console.warn(
+ "The report viewer's version cannot be read from version.json file. Please configure it correctly."
+ )
} else {
- console.warn("The result's version tag does not fit the report viewer's version. Trying to read it anyhow but be careful.");
- alert("The result's version(" + jsonVersion.major + "." + jsonVersion.minor + "." + jsonVersion.patch + ") tag does not fit the report viewer's version(" + reportViewerVersion.major + "." + reportViewerVersion.minor + "." + reportViewerVersion.patch + "). " +
- "Trying to read it anyhow but be careful.")
+ console.warn(
+ "The result's version tag does not fit the report viewer's version. Trying to read it anyhow but be careful."
+ )
+ alert(
+ "The result's version(" +
+ jsonVersion.major +
+ '.' +
+ jsonVersion.minor +
+ '.' +
+ jsonVersion.patch +
+ ") tag does not fit the report viewer's version(" +
+ reportViewerVersion.major +
+ '.' +
+ reportViewerVersion.minor +
+ '.' +
+ reportViewerVersion.patch +
+ '). ' +
+ 'Trying to read it anyhow but be careful.'
+ )
}
}
- sessionStorage.setItem("versionAlert","true");
+ sessionStorage.setItem('versionAlert', 'true')
}
}
- private static saveSubmissionsToComparisonNameMap(json: Record){
- const submissionIdsToComparisonName =
- json.submission_ids_to_comparison_file_name as Map<
+ private static saveSubmissionsToComparisonNameMap(json: Record) {
+ const submissionIdsToComparisonName = json.submission_ids_to_comparison_file_name as Map<
string,
Map
- >;
- const test: Array> = Object.entries(
- submissionIdsToComparisonName
- );
- const comparisonMap = new Map>(
- );
- for (const [key, value] of test) {
- comparisonMap.set(key as string, new Map(Object.entries(value as object)));
- }
+ >
+ const test: Array> = Object.entries(submissionIdsToComparisonName)
+ const comparisonMap = new Map>()
+ for (const [key, value] of test) {
+ comparisonMap.set(key as string, new Map(Object.entries(value as object)))
+ }
- store.commit("saveComparisonFileLookup", comparisonMap);
+ store().saveComparisonFileLookup(comparisonMap)
}
}
diff --git a/report-viewer/src/router/index.ts b/report-viewer/src/router/index.ts
index 212a0241f..ad16a6cbe 100644
--- a/report-viewer/src/router/index.ts
+++ b/report-viewer/src/router/index.ts
@@ -1,36 +1,30 @@
-import "./public-path"
-import {createRouter, createWebHistory, RouteRecordRaw} from "vue-router";
-
-/**
- * Router containing the navigation destinations.
- */
-const routes: Array = [
- {
- path: "/",
- name: "FileUploadView",
- component: () => import('@/views/FileUploadView.vue'),
- },
- {
- path: "/overview",
- name: "OverviewView",
- component: () => import('@/views/OverviewView.vue'),
- },
- {
- path: "/comparison/:firstId/:secondId",
- name: "ComparisonView",
- component: () => import('@/views/ComparisonView.vue'),
- props: true,
- },
- {
- path: "/error",
- name: "ErrorView",
- component: () => import('@/views/ErrorView.vue'),
- },
-];
+import { createRouter, createWebHistory } from 'vue-router'
const router = createRouter({
- history: createWebHistory(__webpack_public_path__),
- routes,
-});
+ history: createWebHistory(import.meta.env.BASE_URL),
+ routes: [
+ {
+ path: '/',
+ name: 'FileUploadView',
+ component: () => import('@/views/FileUploadView.vue')
+ },
+ {
+ path: '/overview',
+ name: 'OverviewView',
+ component: () => import('@/views/OverviewView.vue')
+ },
+ {
+ path: '/comparison/:firstId/:secondId',
+ name: 'ComparisonView',
+ component: () => import('@/views/ComparisonView.vue'),
+ props: true
+ },
+ {
+ path: '/error',
+ name: 'ErrorView',
+ component: () => import('@/views/ErrorView.vue')
+ }
+ ]
+})
-export default router;
+export default router
diff --git a/report-viewer/src/router/public-path.js b/report-viewer/src/router/public-path.js
deleted file mode 100644
index 9330b3135..000000000
--- a/report-viewer/src/router/public-path.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* global __webpack_public_path__:writable */
-/* exported __webpack_public_path__ */
-
-__webpack_public_path__ = window.PUBLIC_PATH;
\ No newline at end of file
diff --git a/report-viewer/src/shims-vue.d.ts b/report-viewer/src/shims-vue.d.ts
deleted file mode 100644
index 3804a43e2..000000000
--- a/report-viewer/src/shims-vue.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/* eslint-disable */
-declare module '*.vue' {
- import type { DefineComponent } from 'vue'
- const component: DefineComponent<{}, {}, any>
- export default component
-}
diff --git a/report-viewer/src/store/store.ts b/report-viewer/src/store/store.ts
deleted file mode 100644
index 58486d51d..000000000
--- a/report-viewer/src/store/store.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-import { createStore } from "vuex";
-
-/**
- * Local store. Stores the state of the application.
- */
-
-interface State {
- /**
- * The set of ids to be hidden.
- */
- anonymous: Set;
- /**
- * Stored files if zip mode is used. Stores the files as key - file name, value - file string
- */
- files: Record;
- submissions: Record>;
- /**
- * Indicates whether local mode is used.
- */
- local: boolean;
- /**
- * Indicates whether zip mode is used.
- */
- zip: boolean;
- /**
- * Indicates whether single file mode is used.
- */
- single: boolean;
- /**
- * Files string if single mode is used.
- */
- fileString: string;
-
- fileIdToDisplayName: Map;
- submissionIdsToComparisonFileName: Map>;
-}
-
-interface File {
- fileName: string;
- data: string;
-}
-interface SubmissionFile {
- name: string;
- file: File;
-}
-
-interface LoadConfiguration {
- local: boolean;
- zip: boolean;
- single: boolean;
- fileString: string;
-}
-
-const store = createStore({
- state: {
- submissionIdsToComparisonFileName: new Map>(),
- /**
- * The set of ids to be hidden.
- */
- anonymous: new Set(),
- /**
- * Stored files if zip mode is used. Stores the files as key - file name, value - file string
- */
- files: {},
- submissions: {},
- /**
- * Indicates whether local mode is used.
- */
- local: false,
- /**
- * Indicates whether zip mode is used.
- */
- zip: false,
- /**
- * Indicates whether single file mode is used.
- */
- single: false,
- /**
- * Files string if single mode is used.
- */
- fileString: "",
- fileIdToDisplayName: new Map(),
- },
- getters: {
- filesOfSubmission: (state) => (name: string) => {
- return Array.from(state.submissions[name], ([name, value]) => ({
- name,
- value,
- }));
- },
- submissionDisplayName: (state) => (id: string) => {
- return state.fileIdToDisplayName.get(id);
- },
- getSubmissionIds(state): Array {
- return Array.from(state.fileIdToDisplayName.keys());
- },
- getComparisonFileName:
- (state) => (submissionId1: string, submissionId2: string) => {
- return state.submissionIdsToComparisonFileName
- .get(submissionId1)
- ?.get(submissionId2);
- },
- getComparisonFileForSubmissions:
- (state, getters) => (submissionId1: string, submissionId2: string) => {
- const expectedFileName = getters.getComparisonFileName(
- submissionId1,
- submissionId2
- );
- const index = Object.keys(store.state.files).find((name) =>
- name.endsWith(expectedFileName)
- );
- return index != undefined ? store.state.files[index] : undefined;
- },
- },
- mutations: {
- clearStore(){
- store.replaceState({
- submissionIdsToComparisonFileName: new Map>(),
- anonymous: new Set(),
- files: {},
- submissions: {},
- local: false,
- zip: false,
- single: false,
- fileString: "",
- fileIdToDisplayName: new Map(),
- });
- },
- addAnonymous(state: State, id) {
- for (let i = 0; i < id.length; i++) {
- state.anonymous.add(id[i]);
- }
- },
- saveComparisonFileLookup(
- state: State,
- map: Map>
- ) {
- state.submissionIdsToComparisonFileName = map;
- },
- removeAnonymous(state, id) {
- for (let i = 0; i < id.length; i++) {
- state.anonymous.delete(id[i]);
- }
- },
- resetAnonymous(state) {
- state.anonymous = new Set();
- },
- saveFile(state, file: File) {
- state.files[file.fileName] = file.data;
- },
- saveSubmissionNames(state, names: Map) {
- state.fileIdToDisplayName = names;
- },
- saveSubmissionFile(state, submissionFile: SubmissionFile) {
- if (!state.submissions[submissionFile.name]) {
- state.submissions[submissionFile.name] = new Map();
- }
- state.submissions[submissionFile.name].set(
- submissionFile.file.fileName,
- submissionFile.file.data
- );
- },
- setLoadingType(state, payload: LoadConfiguration) {
- state.local = payload.local;
- state.zip = payload.zip;
- state.single = payload.single;
- state.fileString = payload.fileString;
- },
- },
-});
-
-export default store;
diff --git a/report-viewer/src/stores/state.ts b/report-viewer/src/stores/state.ts
new file mode 100644
index 000000000..6b0da4664
--- /dev/null
+++ b/report-viewer/src/stores/state.ts
@@ -0,0 +1,50 @@
+/**
+ * Local store. Stores the state of the application.
+ */
+export interface State {
+ /**
+ * The set of ids to be hidden.
+ */
+ anonymous: Set
+ /**
+ * Stored files if zip mode is used. Stores the files as key - file name, value - file string
+ */
+ files: Record
+ submissions: Record>
+ /**
+ * Indicates whether local mode is used.
+ */
+ local: boolean
+ /**
+ * Indicates whether zip mode is used.
+ */
+ zip: boolean
+ /**
+ * Indicates whether single file mode is used.
+ */
+ single: boolean
+ /**
+ * Files string if single mode is used.
+ */
+ fileString: string
+
+ fileIdToDisplayName: Map
+ submissionIdsToComparisonFileName: Map>
+}
+
+export interface File {
+ fileName: string
+ data: string
+}
+
+export interface SubmissionFile {
+ name: string
+ file: File
+}
+
+export interface LoadConfiguration {
+ local: boolean
+ zip: boolean
+ single: boolean
+ fileString: string
+}
diff --git a/report-viewer/src/stores/store.ts b/report-viewer/src/stores/store.ts
new file mode 100644
index 000000000..92bb87838
--- /dev/null
+++ b/report-viewer/src/stores/store.ts
@@ -0,0 +1,86 @@
+import { defineStore } from 'pinia'
+import type { State, SubmissionFile, File, LoadConfiguration } from './state'
+
+const store = defineStore('store', {
+ state: (): State => ({
+ submissionIdsToComparisonFileName: new Map>(),
+ anonymous: new Set(),
+ files: {},
+ submissions: {},
+ local: false,
+ zip: false,
+ single: false,
+ fileString: '',
+ fileIdToDisplayName: new Map()
+ }),
+ getters: {
+ filesOfSubmission: (state) => (name: string) => {
+ return Array.from(state.submissions[name], ([name, value]) => ({
+ name,
+ value
+ }))
+ },
+ submissionDisplayName: (state) => (id: string) => {
+ return state.fileIdToDisplayName.get(id)
+ },
+ getSubmissionIds(state): Array {
+ return Array.from(state.fileIdToDisplayName.keys())
+ },
+ getComparisonFileName: (state) => (submissionId1: string, submissionId2: string) => {
+ return state.submissionIdsToComparisonFileName.get(submissionId1)?.get(submissionId2)
+ },
+ getComparisonFileForSubmissions() {
+ return (submissionId1: string, submissionId2: string) => {
+ const expectedFileName = this.getComparisonFileName(submissionId1, submissionId2)
+ const index = expectedFileName
+ ? Object.keys(this.files).find((name) => name.endsWith(expectedFileName))
+ : undefined
+ return index != undefined ? this.files[index] : undefined
+ }
+ }
+ },
+ actions: {
+ clearStore() {
+ this.$reset()
+ },
+ addAnonymous(id: string[]) {
+ for (let i = 0; i < id.length; i++) {
+ this.anonymous.add(id[i])
+ }
+ },
+ saveComparisonFileLookup(map: Map>) {
+ this.submissionIdsToComparisonFileName = map
+ },
+ removeAnonymous(id: string[]) {
+ for (let i = 0; i < id.length; i++) {
+ this.anonymous.delete(id[i])
+ }
+ },
+ resetAnonymous() {
+ this.anonymous = new Set()
+ },
+ saveFile(file: File) {
+ this.files[file.fileName] = file.data
+ },
+ saveSubmissionNames(names: Map) {
+ this.fileIdToDisplayName = names
+ },
+ saveSubmissionFile(submissionFile: SubmissionFile) {
+ if (!this.submissions[submissionFile.name]) {
+ this.submissions[submissionFile.name] = new Map()
+ }
+ this.submissions[submissionFile.name].set(
+ submissionFile.file.fileName,
+ submissionFile.file.data
+ )
+ },
+ setLoadingType(payload: LoadConfiguration) {
+ this.local = payload.local
+ this.zip = payload.zip
+ this.single = payload.single
+ this.fileString = payload.fileString
+ }
+ }
+})
+
+export default store
diff --git a/report-viewer/src/utils/Utils.ts b/report-viewer/src/utils/Utils.ts
index 42de74611..6dde383d2 100644
--- a/report-viewer/src/utils/Utils.ts
+++ b/report-viewer/src/utils/Utils.ts
@@ -5,5 +5,5 @@
* @param line Line number.
*/
export function generateLineCodeLink(index: number, fileName: string, line: number): string {
- return String(index).concat(fileName).concat(String(line))
+ return String(index).concat(fileName).concat(String(line))
}
diff --git a/report-viewer/src/version.json b/report-viewer/src/version.json
index 1b174cd51..0841e990d 100644
--- a/report-viewer/src/version.json
+++ b/report-viewer/src/version.json
@@ -4,4 +4,4 @@
"minor": 0,
"patch": 0
}
-}
\ No newline at end of file
+}
diff --git a/report-viewer/src/views/ComparisonView.vue b/report-viewer/src/views/ComparisonView.vue
index 51116be5e..0db5d724f 100644
--- a/report-viewer/src/views/ComparisonView.vue
+++ b/report-viewer/src/views/ComparisonView.vue
@@ -15,10 +15,7 @@