Procházet zdrojové kódy

Write SubmissionNames as Tuple of ID and DisplayName

Nesta Bentum před 4 roky
rodič
revize
02b10785a5

+ 9 - 4
jplag/src/main/java/de/jplag/reporting/reportobject/ReportObjectFactory.java

@@ -12,6 +12,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import de.jplag.reporting.reportobject.model.SubmissionName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,6 +27,8 @@ import de.jplag.reporting.reportobject.mapper.MetricMapper;
 import de.jplag.reporting.reportobject.model.Metric;
 import de.jplag.reporting.reportobject.model.OverviewReport;
 
+import static de.jplag.reporting.reportobject.mapper.SubmissionNameMapper.submissionNameOf;
+
 /**
  * Factory class, responsible for converting a JPlagResult object to Overview and Comparison DTO classes.
  */
@@ -125,15 +128,17 @@ public class ReportObjectFactory {
      * Gets the names of all submissions.
      * @return A list containing all submission names.
      */
-    private static List<String> extractSubmissionNames(List<JPlagComparison> comparisons) {
-        HashSet<String> names = new HashSet<>();
+    private static List<SubmissionName> extractSubmissionNames(List<JPlagComparison> comparisons) {
+        HashSet<SubmissionName> names = new HashSet<>();
         comparisons.forEach(comparison -> {
-            names.add(comparison.getFirstSubmission().getName());
-            names.add(comparison.getSecondSubmission().getName());
+            names.add(submissionNameOf(comparison.getFirstSubmission()));
+            names.add(submissionNameOf(comparison.getSecondSubmission()));
         });
         return new ArrayList<>(names);
     }
 
+
+
     /**
      * Gets the names of all comparison.
      * @return A list containing all comparisons.

+ 11 - 0
jplag/src/main/java/de/jplag/reporting/reportobject/mapper/SubmissionNameMapper.java

@@ -0,0 +1,11 @@
+package de.jplag.reporting.reportobject.mapper;
+
+import de.jplag.Submission;
+import de.jplag.reporting.reportobject.model.SubmissionName;
+
+
+public class SubmissionNameMapper {
+    public static SubmissionName submissionNameOf(Submission submission){
+        return new SubmissionName(submission.getNameSanitized(), submission.getName());
+    }
+}

+ 3 - 3
jplag/src/main/java/de/jplag/reporting/reportobject/model/OverviewReport.java

@@ -20,7 +20,7 @@ public class OverviewReport {
     private List<String> fileExtensions;
 
     @JsonProperty("submission_ids")
-    private List<String> submissionIds;
+    private List<SubmissionName> submissionIds;
 
     @JsonProperty("failed_submission_names")
     private List<String> failedSubmissionNames;
@@ -80,7 +80,7 @@ public class OverviewReport {
         return fileExtensions;
     }
 
-    public List<String> getSubmissionIds() {
+    public List<SubmissionName> getSubmissionIds() {
         return submissionIds;
     }
 
@@ -136,7 +136,7 @@ public class OverviewReport {
         this.fileExtensions = List.copyOf(fileExtensions);
     }
 
-    public void setSubmissionIds(List<String> submissionIds) {
+    public void setSubmissionIds(List<SubmissionName> submissionIds) {
         this.submissionIds = List.copyOf(submissionIds);
     }
 

+ 4 - 0
jplag/src/main/java/de/jplag/reporting/reportobject/model/SubmissionName.java

@@ -0,0 +1,4 @@
+package de.jplag.reporting.reportobject.model;
+
+public record SubmissionName(String submissionId, String displayName) {
+}

+ 13 - 32
report-viewer/src/components/ComparisonsTable.vue

@@ -18,59 +18,37 @@
         comparison.matchPercentage
       "
       class="selectable"
+      @click="
+        navigateToComparisonView(
+          comparison.firstSubmissionId,
+          comparison.secondSubmissionId
+        )
+      "
     >
-      <td
-        @click="
-          navigateToComparisonView(
-            comparison.firstSubmissionId,
-            comparison.secondSubmissionId
-          )
-        "
-      >
-        {{ index + 1 }}.
-      </td>
+      <td>{{ index + 1 }}.</td>
       <td
         :class="{
           'anonymous-style': isAnonymous(comparison.firstSubmissionId),
         }"
-        @click="
-          navigateToComparisonView(
-            comparison.firstSubmissionId,
-            comparison.secondSubmissionId
-          )
-        "
       >
         {{
           isAnonymous(comparison.firstSubmissionId)
             ? "Hidden"
-            : comparison.firstSubmissionId
+            : displayName(comparison.firstSubmissionId)
         }}
       </td>
-      <td
-        @click="
-          navigateToComparisonView(
-            comparison.firstSubmissionId,
-            comparison.secondSubmissionId
-          )
-        "
-      >
+      <td>
         <img alt=">>" src="@/assets/double_arrow_black_18dp.svg" />
       </td>
       <td
         :class="{
           'anonymous-style': isAnonymous(comparison.secondSubmissionId),
         }"
-        @click="
-          navigateToComparisonView(
-            comparison.firstSubmissionId,
-            comparison.secondSubmissionId
-          )
-        "
       >
         {{
           isAnonymous(comparison.secondSubmissionId)
             ? "Hidden"
-            : comparison.secondSubmissionId
+            : displayName(comparison.secondSubmissionId)
         }}
       </td>
       <td>{{ formattedMatchPercentage(comparison.matchPercentage) }}</td>
@@ -138,6 +116,8 @@ export default defineComponent({
     let formattedMatchPercentage = (num: number) => num.toFixed(2);
     const dialog: Ref<Array<boolean>> = ref([]);
     props.topComparisons.forEach(() => dialog.value.push(false));
+    const displayName = (submissionId: string) =>
+      store.getters.submissionDisplayName(submissionId);
 
     const toggleDialog = (index: number) => {
       dialog.value[index] = true;
@@ -223,6 +203,7 @@ export default defineComponent({
       clustersWithParticipatingMatches,
       dialog,
 
+      displayName,
       isAnonymous,
       getClustersFor,
       toggleDialog,

+ 5 - 4
report-viewer/src/components/IDsList.vue

@@ -4,7 +4,7 @@
 <template>
   <div class="container">
     <div class="column-list">
-      <p v-for="(id, index) in ids" :key="index"
+      <p v-for="(id, index) in ids.map(s => s.displayName)" :key="index"
          :class="{'selected' : !store.state.anonymous.has(id) && store.state.anonymous.size !== 0 }"
          @click="$emit('idSent', [id])">
         {{ id }}
@@ -14,15 +14,16 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
 import {defineComponent} from "vue";
-import store from "@/store/store.ts"
+import store from "@/store/store"
+import { SubmissionName } from "@/model/SubmissionName";
 
 export default defineComponent({
   name: "IDsList",
   props: {
     ids: {
-      type: Array,
+      type: Array<SubmissionName>,
       required: true
     }
   },

+ 4 - 3
report-viewer/src/model/Overview.ts

@@ -1,5 +1,6 @@
 import { Metric } from "./Metric";
 import { Cluster } from "@/model/Cluster";
+import { SubmissionName } from "./SubmissionName";
 
 export class Overview {
   private readonly _submissionFolderPath: Array<string>;
@@ -7,7 +8,7 @@ export class Overview {
   private readonly _language: string;
   private readonly _fileExtensions: Array<string>;
   private readonly _matchSensitivity: number;
-  private readonly _submissionIds: Array<string>;
+  private readonly _submissionIds: Array<SubmissionName>;
   private readonly _dateOfExecution: string;
   private readonly _durationOfExecution: number;
   private readonly _metrics: Array<Metric>;
@@ -19,7 +20,7 @@ export class Overview {
     language: string,
     fileExtensions: Array<string>,
     matchSensitivity: number,
-    submissionIds: Array<string>,
+    submissionIds: Array<SubmissionName>,
     dateOfExecution: string,
     durationOfExecution: number,
     metrics: Array<Metric>,
@@ -57,7 +58,7 @@ export class Overview {
     return this._matchSensitivity;
   }
 
-  get submissionIds(): Array<string> {
+  get submissionIds(): Array<SubmissionName> {
     return this._submissionIds;
   }
 

+ 4 - 2
report-viewer/src/model/factories/OverviewFactory.ts

@@ -2,6 +2,8 @@ import { Overview } from "../Overview";
 import { Metric } from "../Metric";
 import { ComparisonListElement } from "../ComparisonListElement";
 import { Cluster } from "@/model/Cluster";
+import { SubmissionName } from "../SubmissionName";
+import store from "@/store/store";
 
 export class OverviewFactory {
   static getOverview(json: Record<string, unknown>): Overview {
@@ -10,7 +12,7 @@ export class OverviewFactory {
     const language = json.language as string;
     const fileExtensions = json.file_extensions as Array<string>;
     const matchSensitivity = json.match_sensitivity as number;
-    const submissions = json.submission_ids as Array<string>;
+    const submissions = json.submission_ids as Array<SubmissionName>;
     const dateOfExecution = json.date_of_execution as string;
     const duration = json.execution_time as number as number;
     const metrics = [] as Array<Metric>;
@@ -37,7 +39,7 @@ export class OverviewFactory {
         description: metric.description as string,
       });
     });
-
+    store.commit("saveSubmissionNames", submissions);
     if (json.clusters) {
       (json.clusters as Array<unknown>).forEach((jsonCluster) => {
         const cluster = jsonCluster as Record<string, unknown>;

+ 12 - 0
report-viewer/src/store/store.ts

@@ -1,3 +1,4 @@
+import { SubmissionName } from "@/model/SubmissionName";
 import { createStore } from "vuex";
 
 /**
@@ -30,6 +31,8 @@ interface State {
    * Files string if single mode is used.
    */
   fileString: string;
+
+  fileIdToDisplayName: Map<string, string>;
 }
 
 interface File {
@@ -75,6 +78,7 @@ const store = createStore<State>({
      * Files string if single mode is used.
      */
     fileString: "",
+    fileIdToDisplayName: new Map(),
   },
   getters: {
     filesOfSubmission: (state) => (name: string) => {
@@ -83,6 +87,9 @@ const store = createStore<State>({
         value,
       }));
     },
+    submissionDisplayName: (state) => (id: string) => {
+      return state.fileIdToDisplayName.get(id);
+    },
   },
   mutations: {
     addAnonymous(state: State, id) {
@@ -101,6 +108,11 @@ const store = createStore<State>({
     saveFile(state, file: File) {
       state.files[file.fileName] = file.data;
     },
+    saveSubmissionNames(state, names: Array<SubmissionName>) {
+      state.fileIdToDisplayName = new Map(
+        names.map((name) => [name.submissionId, name.displayName])
+      );
+    },
     saveSubmissionFile(state, submissionFile: SubmissionFile) {
       if (!state.submissions[submissionFile.name]) {
         state.submissions[submissionFile.name] = new Map();

+ 1 - 1
report-viewer/src/views/OverviewView.vue

@@ -161,7 +161,7 @@ export default defineComponent({
           if (store.state.anonymous.size === 0) {
             store.commit(
               "addAnonymous",
-              overview.submissionIds.filter((s) => s !== id[0])
+              overview.submissionIds.map(s => s.submissionId).filter((s) => s !== id[0])
             );
           } else {
             store.commit("addAnonymous", id);