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

[192-webreport] Renamed id1,id2, renamed FileUpload, removing logs

Evgeni 4 лет назад
Родитель
Сommit
ca4f55f13c

+ 0 - 2
report-viewer/src/components/ClusterRadarChart.vue

@@ -60,8 +60,6 @@ export default defineComponent({
     })
 
     watch( () => selectedMember.value, (val) => {
-      console.log("Selected member is " + val)
-      console.log(JSON.stringify(createLabelsFor(val)))
       chartData.value = {
         labels: createLabelsFor(val),
         datasets: [{

+ 2 - 4
report-viewer/src/components/ComparisonsTable.vue

@@ -69,11 +69,11 @@ export default defineComponent({
       dialog.value = true
     }
 
-    const navigateToComparisonView = (id1, id2) => {
+    const navigateToComparisonView = (firstId, secondId) => {
       if(!store.state.single) {
         router.push({
           name: "ComparisonView",
-          query: {id1: id1, id2: id2},
+          query: {firstId: firstId, secondId: secondId},
         })
       }
     }
@@ -91,10 +91,8 @@ export default defineComponent({
       let matches = []
       props.topComparisons.forEach( comparison => {
         if(comparison.firstSubmissionId.includes(id)  && others.includes(comparison.secondSubmissionId)) {
-          console.log("Pushing")
           matches.push({ matchedWith: comparison.secondSubmissionId, percentage: comparison.matchPercentage})
         } else if ( comparison.secondSubmissionId.includes(id) && others.includes(comparison.firstSubmissionId)) {
-          console.log("Pushing")
           matches.push({ matchedWith: comparison.firstSubmissionId, percentage: comparison.matchPercentage})
         }
       })

+ 5 - 5
report-viewer/src/router/index.ts

@@ -1,13 +1,13 @@
 import {createRouter, createWebHistory, RouteRecordRaw} from "vue-router";
 import Overview from "@/views/OverviewView.vue";
 import ComparisonView from "@/views/ComparisonView.vue"
-import FileUpload from "@/views/FileUpload.vue"
+import FileUploadView from "@/views/FileUploadView.vue"
 
 const routes: Array<RouteRecordRaw> = [
   {
     path: "/",
-    name: "FileUpload",
-    component: FileUpload
+    name: "FileUploadView",
+    component: FileUploadView
   },
   {
     path: "/overview",
@@ -19,8 +19,8 @@ const routes: Array<RouteRecordRaw> = [
     name: "ComparisonView",
     component: ComparisonView,
     props: route => ({
-      id1: route.query.id1,
-      id2: route.query.id2
+      id1: route.query.firstId,
+      id2: route.query.secondId
     })
   },
 ];

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

@@ -39,10 +39,10 @@ export default defineComponent({
   name: "ComparisonView",
   components: {FilesContainer, MatchTable, TextInformation },
   props: {
-    id1: {
+    firstId: {
       type: String,
     },
-    id2: {
+    secondId: {
       type: String,
     },
   },
@@ -51,8 +51,8 @@ export default defineComponent({
      * Name of the comparison file. Comparison files should be named {ID1}-{ID2}
      * @type {string}
      */
-    const fileName1 = props.id1.concat("-").concat(props.id2)
-    const fileName2 = props.id2.concat("-").concat(props.id1)
+    const fileName1 = props.firstId.concat("-").concat(props.secondId)
+    const fileName2 = props.firstId.concat("-").concat(props.secondId)
 
     let comparison;
     //getting the comparison file based on the used mode (zip, local, single)

+ 1 - 1
report-viewer/src/views/FileUpload.vue → report-viewer/src/views/FileUploadView.vue

@@ -21,7 +21,7 @@ import store from "@/store/store";
 import { getFileExtension } from "@/utils/Utils";
 
 export default defineComponent({
-  name: "FileUpload",
+  name: "FileUploadView",
   setup() {
     let hasLocalFile;
     //Tries to detect local file. If no files detected, hides local mode from screen.