#373 delete observations-diagrams mocked-data

app/src/components/shared/sharedFilter/SharedTable.ts

@@ -49,7 +49,6 @@ export default class SharedTable extends Vue {
     };
     private showInspectionDownloadBtn = this.filterCriteriaType === FilterCriteriaType.INSPECTION;
     private showWhenFilterCriteriaTypeIsFinding = this.filterCriteriaType === FilterCriteriaType.FINDING;
-    private displayFindingDiagrams = this.filterCriteriaType === FilterCriteriaType.FINDING;
     private displayQsStatusInActions = this.filterCriteriaType === FilterCriteriaType.FINDING;
     private filterForSharedHistory = new Map<string, string>();
     private filterForSharedFilter = ""; // Todo: for communication with SharedFilter later
@@ -83,7 +82,7 @@ export default class SharedTable extends Vue {
     private qAStatusDialogTitle: VueI18n.TranslateResult = "";
     private isDisabledWhenNoPictureItemSelected = true;
     private applyFilterHistory = false;
-    private showInspectionDiagrams = false;
+    private showDiagrams = false;
     private applyFilterButtonColor = "secondary";
     private selectedFilterHistoryDiagram: SelectedFilterHistoryDiagram = {
         type: [],
@@ -95,20 +94,6 @@ export default class SharedTable extends Vue {
      */
     private tableTotalCount = 0;
 
-    /**
-     * Dummy data for the vega-lite
-     */
-    private values = [
-        {a: "A", b: 28}, {a: "B", b: 55}, {a: "C", b: 43},
-        {a: "D", b: 91}, {a: "E", b: 81}, {a: "F", b: 53},
-        {a: "G", b: 19}, {a: "H", b: 87}, {a: "I", b: 52},
-    ];
-
-    private encoding = {
-        x: {field: "a", type: "nominal", axis: {labelAngle: 0}},
-        y: {field: "b", type: "quantitative"},
-    };
-
     private mounted() {
         this.viewOptions.includes(0) ? this.showData = true : this.showData = false;
         this.viewOptions.includes(1) ? this.showPicture = true : this.showPicture = false;
@@ -479,7 +464,7 @@ export default class SharedTable extends Vue {
 
     private setSelectedFilterHistoryItems(selectedFilterHistoryItems: FilterHistoryFavorites[]) {
         this.applyFilterHistory = true;
-        this.showInspectionDiagrams = false;
+        this.showDiagrams = false;
         this.selectedFilterHistoryItems = selectedFilterHistoryItems;
         if (selectedFilterHistoryItems.length) {
             this.selectedFilterHistoryDiagram.filterHistory = selectedFilterHistoryItems[0].id;
@@ -491,7 +476,7 @@ export default class SharedTable extends Vue {
         this.resetTable();
         this.$emit("inputApplyFilterHistory", this.applyFilterHistory);
         if (this.applyFilterHistory) {
-            this.showInspectionDiagrams = true;
+            this.showDiagrams = true;
             this.$emit("inputFilterHistory", this.selectedFilterHistoryItems);
         } else {
             this.$emit("inputFilter", this.filterFromSharedFilter);

app/src/components/shared/sharedFilter/SharedTable.vue

@@ -494,10 +494,11 @@
         </div>
         <div v-if="mapButton" data-testid="mapView"></div>
         <div v-if="diagramButton" data-testid="diagramView">
-            <div class='dashboard' v-if="displayFindingDiagrams">
-                <vega-lite :data="values" mark="bar" :encoding="encoding"/>
-            </div>
-            <v-row v-if="inspectionType && applyFilterHistory && showInspectionDiagrams">
+            <v-row v-if="findingType && applyFilterHistory && showDiagrams">
+                <FilterHistoryDiagrams :filterCriteriaType="filterCriteriaType"
+                                       :selectedFilterHistoryDiagram="selectedFilterHistoryDiagram"/>
+            </v-row>
+            <v-row v-if="inspectionType && applyFilterHistory && showDiagrams">
                 <FilterHistoryDiagrams :filterCriteriaType="filterCriteriaType"
                                        :selectedFilterHistoryDiagram="selectedFilterHistoryDiagram"/>
             </v-row>