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

Improve Codestyle and Error Handling

Nesta Bentum 4 лет назад
Родитель
Сommit
fa874b7fde

+ 22 - 0
report-viewer/src/assets/radar-chart-configuration.ts

@@ -0,0 +1,22 @@
+
+ const radarChartStyle ={
+    fill: true,
+    backgroundColor: "rgba(149, 168, 241, 0.5)",
+    borderColor: "rgba(149, 168, 241, 1)",
+    pointBackgroundColor: "rgba(149, 168, 241, 1)",
+    pointBorderColor: "#fff",
+    pointHoverBackgroundColor: "#fff",
+    pointHoverBorderColor: "rgb(255, 99, 132)",
+  }
+  const radarChartOptions = {
+    legend: {
+      display: false,
+    },
+    scales: {
+      r: {
+        suggestedMin: 50,
+        suggestedMax: 100,
+      },
+    },
+  }
+  export {radarChartStyle,radarChartOptions}

+ 35 - 37
report-viewer/src/components/ClusterRadarChart.vue

@@ -4,16 +4,21 @@
 -->
 -->
 <template>
 <template>
   <div class="wrapper">
   <div class="wrapper">
-    <select v-model="selectedMember">
-      <option v-for="(member, index) in cluster.members.keys()" :key="index">
-        {{ member }}
-      </option>
-    </select>
-    <RadarChart
-      :chartData="chartData"
-      :options="options"
-      class="chart"
-    ></RadarChart>
+    <div v-if="!hasNoMember" class="wrapper">
+      <select v-model="selectedMember">
+        <option v-for="(member, index) in cluster.members.keys()" :key="index">
+          {{ member }}
+        </option>
+      </select>
+      <RadarChart
+        :chartData="chartData"
+        :options="options"
+        class="chart"
+      ></RadarChart>
+    </div>
+    <div v-if="hasNoMember" class="no-member">
+      <span>This cluster has no members.</span>
+    </div>
   </div>
   </div>
 </template>
 </template>
 
 
@@ -23,6 +28,10 @@ import { RadarChart } from "vue-chart-3";
 import { Chart, ChartData, registerables } from "chart.js";
 import { Chart, ChartData, registerables } from "chart.js";
 import ChartDataLabels from "chartjs-plugin-datalabels";
 import ChartDataLabels from "chartjs-plugin-datalabels";
 import { ClusterListElement } from "@/model/ClusterListElement";
 import { ClusterListElement } from "@/model/ClusterListElement";
+import {
+  radarChartStyle,
+  radarChartOptions,
+} from "@/assets/radar-chart-configuration";
 
 
 Chart.register(...registerables);
 Chart.register(...registerables);
 Chart.register(ChartDataLabels);
 Chart.register(ChartDataLabels);
@@ -37,9 +46,11 @@ export default defineComponent({
     },
     },
   },
   },
   setup(props) {
   setup(props) {
-    const getIdOfFirstSubmission = () =>
-      props.cluster.members.keys().next().value;
-    const selectedMember = ref(getIdOfFirstSubmission());
+    const getIdOfFirstSubmission = () => {
+      const firstMember = props.cluster.members.keys().next().value;
+      hasNoMember = !firstMember;
+      return firstMember;
+    };
 
 
     const createLabelsFor = (member: string): Array<string> => {
     const createLabelsFor = (member: string): Array<string> => {
       let matchedWith = new Array<string>();
       let matchedWith = new Array<string>();
@@ -58,39 +69,21 @@ export default defineComponent({
     const roundToTwoDecimals = (num: number): number =>
     const roundToTwoDecimals = (num: number): number =>
       Math.round((num + Number.EPSILON) * 100) / 100;
       Math.round((num + Number.EPSILON) * 100) / 100;
 
 
-    const chartStyle = {
-      fill: true,
-      backgroundColor: "rgba(149, 168, 241, 0.5)",
-      borderColor: "rgba(149, 168, 241, 1)",
-      pointBackgroundColor: "rgba(149, 168, 241, 1)",
-      pointBorderColor: "#fff",
-      pointHoverBackgroundColor: "#fff",
-      pointHoverBorderColor: "rgb(255, 99, 132)",
-    };
+    const selectedMember = ref(getIdOfFirstSubmission());
 
 
     const chartData: Ref<ChartData<"radar", (number | null)[], unknown>> = ref({
     const chartData: Ref<ChartData<"radar", (number | null)[], unknown>> = ref({
       labels: createLabelsFor(getIdOfFirstSubmission()),
       labels: createLabelsFor(getIdOfFirstSubmission()),
       datasets: [
       datasets: [
         {
         {
-          ...chartStyle,
+          ...radarChartStyle,
           label: getIdOfFirstSubmission(),
           label: getIdOfFirstSubmission(),
           data: createDataSetFor(getIdOfFirstSubmission()),
           data: createDataSetFor(getIdOfFirstSubmission()),
         },
         },
       ],
       ],
     });
     });
 
 
-    const options = ref({
-      legend: {
-        display: false,
-      },
-      scales: {
-        r: {
-          suggestedMin: 50,
-          suggestedMax: 100,
-        },
-      },
-    });
-
+    const options = ref(radarChartOptions);
+    let hasNoMember = false;
     watch(
     watch(
       () => selectedMember.value,
       () => selectedMember.value,
       (val) => {
       (val) => {
@@ -98,7 +91,7 @@ export default defineComponent({
           labels: createLabelsFor(val),
           labels: createLabelsFor(val),
           datasets: [
           datasets: [
             {
             {
-              ...chartStyle,
+              ...radarChartStyle,
               label: val,
               label: val,
               data: createDataSetFor(val),
               data: createDataSetFor(val),
             },
             },
@@ -111,6 +104,7 @@ export default defineComponent({
       selectedMember,
       selectedMember,
       chartData,
       chartData,
       options,
       options,
+      hasNoMember,
     };
     };
   },
   },
 });
 });
@@ -122,7 +116,11 @@ export default defineComponent({
   flex-direction: column;
   flex-direction: column;
   flex-wrap: nowrap;
   flex-wrap: nowrap;
 }
 }
-
+.no-member {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+}
 .chart {
 .chart {
   height: 50vw;
   height: 50vw;
 }
 }

+ 1 - 8
report-viewer/src/components/ClustersList.vue

@@ -49,15 +49,8 @@ export default defineComponent({
       const membersIterator = cluster.members.keys();
       const membersIterator = cluster.members.keys();
       const members = Array.from(membersIterator);
       const members = Array.from(membersIterator);
       let concatenatedMembers = "";
       let concatenatedMembers = "";
-      let i;
       const maxMembersToShow = 5;
       const maxMembersToShow = 5;
-      const numOfMembersActuallyShown = Math.min(maxMembersToShow, members.length);
-      for (i = 0; i < numOfMembersActuallyShown; i++) {
-        concatenatedMembers += members[i];
-        if (i < numOfMembersActuallyShown - 1) {
-          concatenatedMembers += ", ";
-        }
-      }
+      concatenatedMembers = members.slice(0, maxMembersToShow).join(", ");
       if (members.length > maxMembersToShow) {
       if (members.length > maxMembersToShow) {
         concatenatedMembers += ",...";
         concatenatedMembers += ",...";
       }
       }

+ 2 - 8
report-viewer/src/components/CodePanel.vue

@@ -151,15 +151,9 @@ export default defineComponent({
           file: m.linked_file,
           file: m.linked_file,
           line: m.linked_line,
           line: m.linked_line,
         };
         };
-        //check whether line is start of match and assign true if yes
-        if (i === m.start) {
-          isFirst.value[i] = true;
-        }
-        //check whether line is end of match and assign true if yes
-        if (i === m.end) {
-          isLast.value[i] = true;
-        }
       }
       }
+      isFirst.value[m.start] = true;
+      isLast.value[m.end] = true;
     });
     });
     //assign default values for all line which are not contained in matches
     //assign default values for all line which are not contained in matches
     for (let i = 0; i < props.lines.length; i++) {
     for (let i = 0; i < props.lines.length; i++) {

+ 1 - 1
report-viewer/src/components/FilesContainer.vue

@@ -71,7 +71,7 @@ export default defineComponent({
      * @param file
      * @param file
      * @param line
      * @param line
      */
      */
-    const lineSelected = (e: any, index: number, file: string, line: number) => {
+    const lineSelected = (e: unknown, index: number, file: string, line: number) => {
       emit("lineSelected", e, index, file, line);
       emit("lineSelected", e, index, file, line);
     };
     };
     return {
     return {

+ 8 - 6
report-viewer/src/views/ComparisonView.vue

@@ -112,12 +112,14 @@ export default defineComponent({
       }
       }
     } else if (store.state.zip) {
     } else if (store.state.zip) {
       const getComparisonFileFor = (id1: string, id2: string) => {
       const getComparisonFileFor = (id1: string, id2: string) => {
-        const index = Object.keys(store.state.files).filter(
+        const index = Object.keys(store.state.files).find(
           (name) =>
           (name) =>
             name.endsWith(id1.concat("-").concat(id2).concat(".json")) ||
             name.endsWith(id1.concat("-").concat(id2).concat(".json")) ||
             name.endsWith(id2.concat("-").concat(id1).concat(".json"))
             name.endsWith(id2.concat("-").concat(id1).concat(".json"))
-        )[0];
-        return store.state.files[index];
+        );
+        return index != undefined
+          ? store.state.files[index]
+          : console.log("Could not find comparison file."); // TODO introduce error page to navigate to
       };
       };
 
 
       let comparisonFile = getComparisonFileFor(props.firstId, props.secondId);
       let comparisonFile = getComparisonFileFor(props.firstId, props.secondId);
@@ -167,7 +169,7 @@ export default defineComponent({
      * @param line
      * @param line
      */
      */
     const showMatchInFirst = (
     const showMatchInFirst = (
-      e: any,
+      e: unknown,
       panel: number,
       panel: number,
       file: string,
       file: string,
       line: number
       line: number
@@ -187,7 +189,7 @@ export default defineComponent({
      * @param line
      * @param line
      */
      */
     const showMatchInSecond = (
     const showMatchInSecond = (
-      e: any,
+      e: unknown,
       panel: number,
       panel: number,
       file: string,
       file: string,
       line: number
       line: number
@@ -200,7 +202,7 @@ export default defineComponent({
         ?.scrollIntoView();
         ?.scrollIntoView();
     };
     };
 
 
-    const showMatch = (e: any, match: Match) => {
+    const showMatch = (e: unknown, match: Match) => {
       showMatchInFirst(e, 1, match.firstFile, match.startInFirst);
       showMatchInFirst(e, 1, match.firstFile, match.startInFirst);
       showMatchInSecond(e, 2, match.secondFile, match.startInSecond);
       showMatchInSecond(e, 2, match.secondFile, match.startInSecond);
     };
     };

+ 8 - 4
report-viewer/src/views/OverviewView.vue

@@ -113,10 +113,12 @@ export default defineComponent({
   setup() {
   setup() {
     const store = useStore();
     const store = useStore();
     const overviewFile = computed(() => {
     const overviewFile = computed(() => {
-      const index = Object.keys(store.state.files).filter((name) =>
+      const index = Object.keys(store.state.files).find((name) =>
         name.endsWith("overview.json")
         name.endsWith("overview.json")
-      )[0];
-      return store.state.files[index];
+      );
+      return index != undefined
+        ? store.state.files[index]
+        : console.log("Could not find overview.json"); // TODO introduce error page to navigate to
     });
     });
 
 
     const getOverview = (): Overview => {
     const getOverview = (): Overview => {
@@ -195,7 +197,9 @@ export default defineComponent({
     let distributions = ref(overview.metrics.map((m) => m.distribution));
     let distributions = ref(overview.metrics.map((m) => m.distribution));
 
 
     //Top Comparisons
     //Top Comparisons
-    let topComps : Ref<Array<Array<ComparisonListElement>>>= ref(overview.metrics.map((m) => m.comparisons));
+    let topComps: Ref<Array<Array<ComparisonListElement>>> = ref(
+      overview.metrics.map((m) => m.comparisons)
+    );
 
 
     const hasMoreSubmissionPaths = overview.submissionFolderPath.length > 1;
     const hasMoreSubmissionPaths = overview.submissionFolderPath.length > 1;
     const submissionPathValue = hasMoreSubmissionPaths
     const submissionPathValue = hasMoreSubmissionPaths