From 4c02f6056f81757af1395d540d5e91b6d4683ace Mon Sep 17 00:00:00 2001
From: Oliver Stolpe <oliver.stolpe@bih-charite.de>
Date: Fri, 15 Mar 2024 10:13:16 +0100
Subject: [PATCH] fix: display of variant flagscommentsacmg counts are static
 always 0 (#1376)

---
 .../components/CaseDetail/CardAnnotations.vue | 41 +++++++++++--------
 .../src/components/CaseDetail/Content.vue     | 11 ++++-
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/cases/vueapp/src/components/CaseDetail/CardAnnotations.vue b/cases/vueapp/src/components/CaseDetail/CardAnnotations.vue
index efa677a58..7d12d488d 100644
--- a/cases/vueapp/src/components/CaseDetail/CardAnnotations.vue
+++ b/cases/vueapp/src/components/CaseDetail/CardAnnotations.vue
@@ -1,12 +1,19 @@
 <script setup lang="ts">
-import { useCaseDetailsStore } from '@cases/stores/caseDetails'
+import { useVariantFlagsStore } from '@variants/stores/variantFlags'
+import { useVariantCommentsStore } from '@variants/stores/variantComments'
+import { useVariantAcmgRatingStore } from '@variants/stores/variantAcmgRating'
+import { useSvFlagsStore } from '@svs/stores/strucvarFlags'
 import { computed } from 'vue'
 
 import CaseDetailsFlagIcon from '@cases/components/CaseDetail/FlagIcon.vue'
 
 // Store-related.
 
-const caseDetailsStore = useCaseDetailsStore()
+const variantFlagsStore = useVariantFlagsStore()
+const variantCommentsStore = useVariantCommentsStore()
+const acmgRatingStore = useVariantAcmgRatingStore()
+const svFlagsStore = useSvFlagsStore()
+const svCommentsStore = useVariantCommentsStore()
 
 // Constants.
 
@@ -20,20 +27,18 @@ const flagIds = [
   'flag_doesnt_segregate',
 ] as const
 type FlagIds = (typeof flagIds)[number]
-type Level = 1 | 2 | 3 | 4 | 5
 
 // Component state.
-
-const acmgCountByLevel = computed<{ [level in Level]: number }>(() => {
-  const result = { 1: 0, 2: 0, 3: 0, 4: 0, 5: 0 }
-  for (const acmgRating of caseDetailsStore.acmgRatingList) {
-    const level: Level = acmgRating.class_override ?? acmgRating.class_auto ?? 3
+const acmgCountByLevel = computed<{ [key: number]: number }>(() => {
+  const result: { [key: number]: number } = { 1: 0, 2: 0, 3: 0, 4: 0, 5: 0 }
+  for (const [_, acmgRating] of acmgRatingStore.caseAcmgRatings) {
+    const level: number = acmgRating.classOverride ?? acmgRating.classAuto ?? 3
     result[level] += 1
   }
   return result
 })
 
-const buildComputedAnnoCountByFlag = (theList: any[]) => {
+const buildComputedAnnoCountByFlag = (theList: Map<string, any>) => {
   return computed<{ [flagId in FlagIds]: number }>(() => {
     const result = {
       flag_bookmarked: 0,
@@ -44,7 +49,7 @@ const buildComputedAnnoCountByFlag = (theList: any[]) => {
       flag_segregates: 0,
       flag_doesnt_segregate: 0,
     }
-    for (const varAnno of theList) {
+    for (const [_, varAnno] of theList) {
       for (const flagId of flagIds) {
         if (varAnno[flagId]) {
           result[flagId] += 1
@@ -56,11 +61,9 @@ const buildComputedAnnoCountByFlag = (theList: any[]) => {
 }
 
 const varAnnoCountByFlag = buildComputedAnnoCountByFlag(
-  caseDetailsStore.varAnnoList,
-)
-const svAnnoCountByFlag = buildComputedAnnoCountByFlag(
-  caseDetailsStore.svAnnoList,
+  variantFlagsStore.caseFlags,
 )
+const svAnnoCountByFlag = buildComputedAnnoCountByFlag(svFlagsStore.caseFlags)
 </script>
 
 <template>
@@ -76,7 +79,7 @@ const svAnnoCountByFlag = buildComputedAnnoCountByFlag(
             <strong> ACMG-Classified Variants </strong>
           </div>
           <div class="col-1 text-right">
-            {{ caseDetailsStore.acmgRatingList.length }}
+            {{ acmgRatingStore.caseAcmgRatings.size }}
           </div>
           <div class="col-8">
             V:{{ acmgCountByLevel[5] }} &nbsp; IV:{{
@@ -94,7 +97,9 @@ const svAnnoCountByFlag = buildComputedAnnoCountByFlag(
           <div class="col-3 text-nowrap">
             <strong> Flagged Variants </strong>
           </div>
-          <div class="col-1 text-right">6</div>
+          <div class="col-1 text-right">
+            {{ variantFlagsStore.caseFlags.size }}
+          </div>
           <div class="col-8">
             <span
               v-for="flagId in flagIds"
@@ -114,7 +119,7 @@ const svAnnoCountByFlag = buildComputedAnnoCountByFlag(
             <strong> Commented Variants </strong>
           </div>
           <div class="col-1 text-right">
-            {{ caseDetailsStore.varCommentList.length }}
+            {{ variantCommentsStore.caseComments.size }}
           </div>
         </div>
       </li>
@@ -143,7 +148,7 @@ const svAnnoCountByFlag = buildComputedAnnoCountByFlag(
             <strong> Commented SVs </strong>
           </div>
           <div class="col-1 text-right">
-            {{ caseDetailsStore.svCommentList.length }}
+            {{ svCommentsStore.caseComments.size }}
           </div>
         </div>
       </li>
diff --git a/cases/vueapp/src/components/CaseDetail/Content.vue b/cases/vueapp/src/components/CaseDetail/Content.vue
index 13528ce19..53bd6bb0a 100644
--- a/cases/vueapp/src/components/CaseDetail/Content.vue
+++ b/cases/vueapp/src/components/CaseDetail/Content.vue
@@ -8,6 +8,8 @@ import PaneAnnotations from '@cases/components/CaseDetail/PaneAnnotations.vue'
 import { useRouter } from 'vue-router'
 import { useCaseDetailsStore } from '@cases/stores/caseDetails'
 import { useCaseQcStore } from '@cases_qc/stores/caseQc'
+import { useVariantResultSetStore } from '@variants/stores/variantResultSet'
+import { useSvResultSetStore } from '@svs/stores/svResultSet'
 
 const router = useRouter()
 
@@ -41,16 +43,21 @@ const Tabs = Object.freeze({
 
 const caseDetailsStore = useCaseDetailsStore()
 const caseQcStore = useCaseQcStore()
+const variantResultSetStore = useVariantResultSetStore()
+const svResultSetStore = useSvResultSetStore()
 
 const annosLoading = computed(
-  () => caseDetailsStore.varAnnos === null || caseDetailsStore.svAnnos === null,
+  () =>
+    variantResultSetStore.resultSet === null ||
+    svResultSetStore.resultSet === null,
 )
 const annoCount = computed(() => {
   if (annosLoading.value) {
     return null
   } else {
     return (
-      caseDetailsStore.varAnnoList.length + caseDetailsStore.svAnnoList.length
+      (variantResultSetStore.resultSet.result_row_count ?? 0) +
+      (svResultSetStore.resultSet.result_row_count ?? 0)
     )
   }
 })