Просмотр исходного кода

Adapt report viewer to use submission Ids

IDs for internal use, display name for displaying the submission name.
Nesta Bentum 4 лет назад
Родитель
Сommit
7b2aee6885

+ 11 - 11
report-viewer/src/components/IDsList.vue

@@ -4,35 +4,35 @@
 <template>
 <template>
   <div class="container">
   <div class="container">
     <div class="column-list">
     <div class="column-list">
-      <p v-for="(id, index) in ids.map(s => s.displayName)" :key="index"
+      <p v-for="(id, index) in ids" :key="index"
          :class="{'selected' : !store.state.anonymous.has(id) && store.state.anonymous.size !== 0 }"
          :class="{'selected' : !store.state.anonymous.has(id) && store.state.anonymous.size !== 0 }"
-         @click="$emit('idSent', [id])">
-        {{ id }}
+         @click="emitIdsSent([id])">
+        {{ store.getters.submissionDisplayName(id) }}
       </p>
       </p>
     </div>
     </div>
-    <button @click="$emit('idSent', ids)">Hide/Show all</button>
+    <button @click="emitIdsSent(ids)">Hide/Show all</button>
   </div>
   </div>
 </template>
 </template>
 
 
 <script lang="ts">
 <script lang="ts">
 import {defineComponent} from "vue";
 import {defineComponent} from "vue";
 import store from "@/store/store"
 import store from "@/store/store"
-import { SubmissionName } from "@/model/SubmissionName";
 
 
 export default defineComponent({
 export default defineComponent({
+  emits: ["idSent"],
   name: "IDsList",
   name: "IDsList",
   props: {
   props: {
     ids: {
     ids: {
-      type: Array<SubmissionName>,
+      type: Array<string>,
       required: true
       required: true
     }
     }
   },
   },
-  setup(props) {
-    // eslint-disable-next-line vue/no-setup-props-destructure
-    const savedIds = props.ids
+  setup(_, {emit}) {
+    const emitIdsSent = (ids: string[]) => {
+      emit('idSent', ids);}
     return {
     return {
-      savedIds,
-      store
+      store,
+      emitIdsSent
     }
     }
   }
   }
 })
 })

+ 7 - 8
report-viewer/src/model/Overview.ts

@@ -1,6 +1,5 @@
 import { Metric } from "./Metric";
 import { Metric } from "./Metric";
 import { Cluster } from "@/model/Cluster";
 import { Cluster } from "@/model/Cluster";
-import { SubmissionName } from "./SubmissionName";
 
 
 export class Overview {
 export class Overview {
   private readonly _submissionFolderPath: Array<string>;
   private readonly _submissionFolderPath: Array<string>;
@@ -8,7 +7,7 @@ export class Overview {
   private readonly _language: string;
   private readonly _language: string;
   private readonly _fileExtensions: Array<string>;
   private readonly _fileExtensions: Array<string>;
   private readonly _matchSensitivity: number;
   private readonly _matchSensitivity: number;
-  private readonly _submissionIds: Array<SubmissionName>;
+  private readonly _submissionIdsToComparisonFileName: Map<string,Map<string,string>>;
   private readonly _dateOfExecution: string;
   private readonly _dateOfExecution: string;
   private readonly _durationOfExecution: number;
   private readonly _durationOfExecution: number;
   private readonly _metrics: Array<Metric>;
   private readonly _metrics: Array<Metric>;
@@ -20,22 +19,25 @@ export class Overview {
     language: string,
     language: string,
     fileExtensions: Array<string>,
     fileExtensions: Array<string>,
     matchSensitivity: number,
     matchSensitivity: number,
-    submissionIds: Array<SubmissionName>,
     dateOfExecution: string,
     dateOfExecution: string,
     durationOfExecution: number,
     durationOfExecution: number,
     metrics: Array<Metric>,
     metrics: Array<Metric>,
-    clusters: Array<Cluster>
+    clusters: Array<Cluster>,
+    submissionIdsToComparisonFileName: Map<string,Map<string,string>>
   ) {
   ) {
     this._submissionFolderPath = submissionFolderPath;
     this._submissionFolderPath = submissionFolderPath;
     this._baseCodeFolderPath = baseCodeFolderPath;
     this._baseCodeFolderPath = baseCodeFolderPath;
     this._language = language;
     this._language = language;
     this._fileExtensions = fileExtensions;
     this._fileExtensions = fileExtensions;
     this._matchSensitivity = matchSensitivity;
     this._matchSensitivity = matchSensitivity;
-    this._submissionIds = submissionIds;
     this._dateOfExecution = dateOfExecution;
     this._dateOfExecution = dateOfExecution;
     this._durationOfExecution = durationOfExecution;
     this._durationOfExecution = durationOfExecution;
     this._metrics = metrics;
     this._metrics = metrics;
     this._clusters = clusters;
     this._clusters = clusters;
+    this. _submissionIdsToComparisonFileName = submissionIdsToComparisonFileName;
+  }
+  get submissionIdsToComparisonFileName(): Map<string,Map<string,string>> {
+    return this.submissionIdsToComparisonFileName;
   }
   }
 
 
   get submissionFolderPath(): Array<string> {
   get submissionFolderPath(): Array<string> {
@@ -58,9 +60,6 @@ export class Overview {
     return this._matchSensitivity;
     return this._matchSensitivity;
   }
   }
 
 
-  get submissionIds(): Array<SubmissionName> {
-    return this._submissionIds;
-  }
 
 
   get dateOfExecution(): string {
   get dateOfExecution(): string {
     return this._dateOfExecution;
     return this._dateOfExecution;

+ 5 - 5
report-viewer/src/model/factories/OverviewFactory.ts

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

+ 5 - 5
report-viewer/src/store/store.ts

@@ -1,4 +1,3 @@
-import { SubmissionName } from "@/model/SubmissionName";
 import { createStore } from "vuex";
 import { createStore } from "vuex";
 
 
 /**
 /**
@@ -90,6 +89,9 @@ const store = createStore<State>({
     submissionDisplayName: (state) => (id: string) => {
     submissionDisplayName: (state) => (id: string) => {
       return state.fileIdToDisplayName.get(id);
       return state.fileIdToDisplayName.get(id);
     },
     },
+    getSubmissionIds(state) : Array<string> {
+      return Array.from(state.fileIdToDisplayName.keys());
+    },
   },
   },
   mutations: {
   mutations: {
     addAnonymous(state: State, id) {
     addAnonymous(state: State, id) {
@@ -108,10 +110,8 @@ const store = createStore<State>({
     saveFile(state, file: File) {
     saveFile(state, file: File) {
       state.files[file.fileName] = file.data;
       state.files[file.fileName] = file.data;
     },
     },
-    saveSubmissionNames(state, names: Array<SubmissionName>) {
-      state.fileIdToDisplayName = new Map(
-        names.map((name) => [name.submissionId, name.displayName])
-      );
+    saveSubmissionNames(state, names: Map<string, string>) {
+      state.fileIdToDisplayName = names;
     },
     },
     saveSubmissionFile(state, submissionFile: SubmissionFile) {
     saveSubmissionFile(state, submissionFile: SubmissionFile) {
       if (!state.submissions[submissionFile.name]) {
       if (!state.submissions[submissionFile.name]) {

+ 3 - 4
report-viewer/src/views/ComparisonView.vue

@@ -23,12 +23,12 @@
       </div>
       </div>
       <TextInformation
       <TextInformation
         :anonymous="isAnonymous(firstId)"
         :anonymous="isAnonymous(firstId)"
-        :value="firstId"
+        :value="store.getters.submissionDisplayName(firstId)"
         label="Submission 1"
         label="Submission 1"
       />
       />
       <TextInformation
       <TextInformation
         :anonymous="store.state.anonymous.has(secondId)"
         :anonymous="store.state.anonymous.has(secondId)"
-        :value="secondId"
+        :value="store.getters.submissionDisplayName(secondId)"
         label="Submission 2"
         label="Submission 2"
       />
       />
       <TextInformation :value="comparison.match_percentage" label="Match %" />
       <TextInformation :value="comparison.match_percentage" label="Match %" />
@@ -133,7 +133,6 @@ export default defineComponent({
         JSON.parse(store.state.fileString)
         JSON.parse(store.state.fileString)
       );
       );
     }
     }
-
     if (!comparison) {
     if (!comparison) {
       console.warn("Could not build comparison file");
       console.warn("Could not build comparison file");
       return;
       return;
@@ -219,6 +218,7 @@ export default defineComponent({
       filesOfFirst,
       filesOfFirst,
       filesOfSecond,
       filesOfSecond,
       hideLeftPanel,
       hideLeftPanel,
+      store,
 
 
       toggleCollapseFirst,
       toggleCollapseFirst,
       toggleCollapseSecond,
       toggleCollapseSecond,
@@ -228,7 +228,6 @@ export default defineComponent({
       togglePanel,
       togglePanel,
       isAnonymous,
       isAnonymous,
 
 
-      store,
     };
     };
   },
   },
 });
 });

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

@@ -35,11 +35,11 @@
         />
         />
         <TextInformation
         <TextInformation
           :has-additional-info="true"
           :has-additional-info="true"
-          :value="overview.submissionIds.length"
+          :value="store.getters.getSubmissionIds.size"
           additional-info-title="Submission IDs:"
           additional-info-title="Submission IDs:"
           label="Submissions"
           label="Submissions"
         >
         >
-          <IDsList :ids="overview.submissionIds" @id-sent="handleId" />
+          <IDsList :ids="store.getters.getSubmissionIds" @id-sent="handleId" />
         </TextInformation>
         </TextInformation>
         <TextInformation
         <TextInformation
           :value="overview.dateOfExecution"
           :value="overview.dateOfExecution"
@@ -145,26 +145,26 @@ export default defineComponent({
      * Handles the selection of an Id to anonymize.
      * Handles the selection of an Id to anonymize.
      * If all submission ids are provided as parameter it hides or displays them based on their previous state.
      * If all submission ids are provided as parameter it hides or displays them based on their previous state.
      * If a single id is provided it hides all of the other ids except for the chosen one.
      * If a single id is provided it hides all of the other ids except for the chosen one.
-     * @param id
+     * @param ids
      */
      */
-    const handleId = (id: string) => {
-      if (id.length === overview.submissionIds.length) {
+    const handleId = (ids: Array<string>) => {
+      if (ids.length === store.getters.getSubmissionIds.size) {
         if (store.state.anonymous.size > 0) {
         if (store.state.anonymous.size > 0) {
           store.commit("resetAnonymous");
           store.commit("resetAnonymous");
         } else {
         } else {
-          store.commit("addAnonymous", id);
+          store.commit("addAnonymous", ids);
         }
         }
       } else {
       } else {
-        if (store.state.anonymous.has(id[0])) {
-          store.commit("removeAnonymous", id);
+        if (store.state.anonymous.has(ids[0])) {
+          store.commit("removeAnonymous", ids);
         } else {
         } else {
           if (store.state.anonymous.size === 0) {
           if (store.state.anonymous.size === 0) {
             store.commit(
             store.commit(
               "addAnonymous",
               "addAnonymous",
-              overview.submissionIds.map(s => s.submissionId).filter((s) => s !== id[0])
+              store.getters.getSubmissionIds.filter((s: string) => s !== ids[0])
             );
             );
           } else {
           } else {
-            store.commit("addAnonymous", id);
+            store.commit("addAnonymous", ids);
           }
           }
         }
         }
       }
       }