From 926c614937c011352dce47b73c2c0cb3972fcb47 Mon Sep 17 00:00:00 2001
From: orlinmalkja <orlin.malkja@sub.uni-goettingen.de>
Date: Mon, 28 Oct 2024 16:13:57 +0100
Subject: [PATCH 1/5] fix: use visibleAnnotations instead of
 filteredAnnotations to show the line separator or not

---
 src/components/annotations/variants/VariantsList.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/annotations/variants/VariantsList.vue b/src/components/annotations/variants/VariantsList.vue
index 9e627b4f..ac358459 100644
--- a/src/components/annotations/variants/VariantsList.vue
+++ b/src/components/annotations/variants/VariantsList.vue
@@ -10,7 +10,7 @@
       :is-active="isActive(annotation)"
       :toggle="toggle"
       :witness-color="getWitnessColor(annotation.body.value.witness)"
-      :show-separator="showLineSeparator(filteredAnnotations, i)"
+      :show-separator="showLineSeparator(visibleAnnotations, i)"
       @select="addAnnotation(annotation.id)"
       @unselect="removeAnnotation(annotation.id)"
       @show-details="openDetailsDialog"
@@ -65,9 +65,9 @@ function getWitnessColor(witness: string) {
 }
 
 
-function showLineSeparator(filteredAnnotations, i) {
-  if (filteredAnnotations[i+1]) {
-   return Utils.generateTargetSelector(filteredAnnotations[i]) !== Utils.generateTargetSelector(filteredAnnotations[i+1])
+function showLineSeparator(visibleAnnotations, i) {
+  if (visibleAnnotations[i+1]) {
+   return Utils.generateTargetSelector(visibleAnnotations[i]) !== Utils.generateTargetSelector(visibleAnnotations[i+1])
   }
 }
 

From 2826c8fdf3c2dcc72eb676c5e7079af54a6e598d Mon Sep 17 00:00:00 2001
From: orlinmalkja <orlin.malkja@sub.uni-goettingen.de>
Date: Mon, 28 Oct 2024 16:39:41 +0100
Subject: [PATCH 2/5] fix: show the separation line as an hr element after the
 variant item not as the bottom border of the variant item

---
 src/components/annotations/variants/VariantItem.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/annotations/variants/VariantItem.vue b/src/components/annotations/variants/VariantItem.vue
index c78038d4..1ad70d07 100644
--- a/src/components/annotations/variants/VariantItem.vue
+++ b/src/components/annotations/variants/VariantItem.vue
@@ -4,8 +4,7 @@
     :class="[
       't-py-2 t-px-2 -t-mx-2 t-mb-1 t-space-x-2 t-rounded-md',
       { 'hover:t-bg-gray-200 dark:hover:t-bg-gray-600 t-cursor-pointer': !isActive },
-      { 't-bg-gray-300 dark:t-bg-gray-600 active': isActive},
-      { 't-border-b t-border-slate-200 t-rounded-none': showSeparator}]"
+      { 't-bg-gray-300 dark:t-bg-gray-600 active': isActive}]"
     :data-annotation-id="annotation.id"
     @click="handleClick"
   >
@@ -25,7 +24,8 @@
       class="t-w-7/12"
       v-html="entry"
     />
-  </div>
+  </div> 
+  <hr class="t-slate-200 t-my-[6px] t-rounded-none" v-if="showSeparator" />
 </template>
 
 <script setup lang="ts">

From 6a53ea86b96d871caec9c89465d66356d6ba2de8 Mon Sep 17 00:00:00 2001
From: orlinmalkja <orlin.malkja@sub.uni-goettingen.de>
Date: Wed, 30 Oct 2024 13:26:48 +0100
Subject: [PATCH 3/5] test: add a test for the separation line in variants list

---
 .../annotations/variants/VariantItem.vue      |  2 +-
 tests/cypress/e2e/variants.cy.js              | 44 +++++++++++++------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/components/annotations/variants/VariantItem.vue b/src/components/annotations/variants/VariantItem.vue
index 1ad70d07..ce817282 100644
--- a/src/components/annotations/variants/VariantItem.vue
+++ b/src/components/annotations/variants/VariantItem.vue
@@ -25,7 +25,7 @@
       v-html="entry"
     />
   </div> 
-  <hr class="t-slate-200 t-my-[6px] t-rounded-none" v-if="showSeparator" />
+  <hr class="t-slate-200 t-my-[6px] t-rounded-none" v-if="showSeparator" data-cy="variant-sep-line"/>
 </template>
 
 <script setup lang="ts">
diff --git a/tests/cypress/e2e/variants.cy.js b/tests/cypress/e2e/variants.cy.js
index 278063ce..bf1f76f2 100644
--- a/tests/cypress/e2e/variants.cy.js
+++ b/tests/cypress/e2e/variants.cy.js
@@ -81,7 +81,7 @@ const selectors = {
           .get(selectors.list)
           .should('be.visible')
           .children()
-          .should("have.length", 11)
+          .should("have.length", 13)
       });
 
       it('Should switch from an item with no variants to another one with variants and show the list correctly', () => {
@@ -94,7 +94,7 @@ const selectors = {
           .wait(500)
           .get(selectors.list)
           .children()
-          .should('have.length', 11)    
+          .should('have.length', 13)    
       })
 
       it('Should switch normally to the new item when first selecting a few annotations and then switching the item', () => {
@@ -207,7 +207,7 @@ const selectors = {
           .wait(500)
           .get(selectors.list)
           .children()
-          .should('have.length', 11)
+          .should('have.length', 13)
           .eq(0).should('contain', 'omisit').and('not.have.class', 'active')
           .next().should('contain', 'اللبان').and('not.have.class', 'active')
       })
@@ -232,7 +232,7 @@ const selectors = {
          .click()  
          .get(selectors.list)
          .children()
-         .should('have.length', 11)
+         .should('have.length', 13)
          .eq(0)
          .should('not.have.class', 'active')
       })
@@ -294,12 +294,12 @@ const selectors = {
         // 2. remove the variant items of this witness from the variants list
         .get(selectors.list)
         .children()
-        .eq(3)
+        .eq(4)
         .invoke('attr', 'data-annotation-id')
         .should('eq', 'http://ahikar.uni-goettingen.de/ns/annotations/3r14z/annotation-variants-t_Brit_Mus_Add_7209_N1l5l3l5l5l29l4_w_2_1')  // means that first annotation item of this target is DFM 614, instead of Cod Arab
         .get(selectors.list)
         .children()
-        .eq(6)         // expecting that two variant items with Cod Arab 236 were removed, the first variant item of the third target is now 'DFM 614'
+        .eq(8)         // expecting that two variant items with Cod Arab 236 were removed, the first variant item of the third target is now 'DFM 614'
         .invoke('attr', 'data-annotation-id')
         .should('eq', 'http://ahikar.uni-goettingen.de/ns/annotations/3r14z/annotation-variants-t_Brit_Mus_Add_7209_N1l5l3l5l5l29l4_w_3_1')
       })
@@ -314,16 +314,34 @@ const selectors = {
           // effect: add the variant items of this witness in the variants list
           .get(selectors.list)
           .children()
-          .eq(3)
+          .eq(4)
           .invoke('attr', 'data-annotation-id')
           .should('eq', 'http://ahikar.uni-goettingen.de/ns/annotations/3r14z/annotation-variants-t_Brit_Mus_Add_7209_N1l5l3l5l5l29l4_w_2_0')  // means that first annotation item of this group is DFM 614, instead of Cod Arab
           .get(selectors.list)
           .children()
-          .eq(7)         // expecting that two variant items with Cod Arab 236 were removed, then we aim to access the variant item with witness DFM 614 of the third target with index 6 instead of 8
+          .eq(9)         // expecting that two variant items with Cod Arab 236 were removed, then we aim to access the variant item with witness DFM 614 of the third target with index 6 instead of 8
           .invoke('attr', 'data-annotation-id')
           .should('eq', 'http://ahikar.uni-goettingen.de/ns/annotations/3r14z/annotation-variants-t_Brit_Mus_Add_7209_N1l5l3l5l5l29l4_w_3_0')
       })
 
+      it('Should show separation line correctly between annotation groups when deselecting witnesses from the witnesses drop down', () => {
+        cy
+          .clickWitnessItem('4 Witnesses selected', 'Ming. syr. 258')
+          .get(selectors.list)
+          .find('hr[data-cy="variant-sep-line"]')
+          .should('have.length', 2)
+          .get(selectors.list)
+          .children()
+          .eq(2)
+          .invoke('attr', 'data-cy')
+          .should('eq', 'variant-sep-line')
+        cy.get(selectors.list) 
+          .children()
+          .eq(6)
+          .invoke('attr', 'data-cy')
+          .should('eq', 'variant-sep-line')
+      })
+
       /*
       Commented out this test, since we hide the witnesses details dialog box
       it('Should show a dialog box containing a list of a witnesses and a description of them', () => {
@@ -368,7 +386,7 @@ const selectors = {
         // the corresponding variant items should be selected
         .get(selectors.list)
         .children()
-        .eq(2)
+        .eq(3)
         .should('not.have.class', 'active')
         .next()
         .should('have.class', 'active')
@@ -451,16 +469,16 @@ const selectors = {
         // only the variant items controled by the witnesses filter and referring to the target should be selected - 3rd and 4th variant item
         cy.get(selectors.list)
         .children()
-        .should('have.length', 6)
+        .should('have.length', 8)
         .eq(0).should('contain','Ming. syr. 258').and('not.have.class','active')
         .next().should('contain','Sach. 339').and('not.have.class','active')    // eq(1)
+        .next()                                                                 // separation line
         .next().should('contain','Ming. syr. 258').and('have.class','active')    // eq(2)
         .next().should('contain','Sach. 339').and('have.class','active')
+        .next()                                                                 // separation line
         .next().should('contain','Ming. syr. 258').and('not.have.class','active')
         .next().should('contain','Sach. 339').and('not.have.class','active')
       })
-
-
     })
 
     describe('Single select mode', () => {
@@ -516,7 +534,7 @@ const selectors = {
               .get(selectors.list)
               .should('be.visible')
               .children()
-              .should("have.length", 11)      // we have 11 variant items as in the normal mode - no single select mode
+              .should("have.length", 13)      // we have 11 variant items as in the normal mode - no single select mode
             })
           })
       })

From 35ce8127c242286ae5a17d8ac6709a7e876880ff Mon Sep 17 00:00:00 2001
From: orlinmalkja <orlin.malkja@sub.uni-goettingen.de>
Date: Wed, 30 Oct 2024 14:27:06 +0100
Subject: [PATCH 4/5] test: change the highlighting level of the target when
 all its witnesses are deselected from the drop down

---
 tests/cypress/e2e/variants.cy.js | 36 ++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/tests/cypress/e2e/variants.cy.js b/tests/cypress/e2e/variants.cy.js
index bf1f76f2..715e3c26 100644
--- a/tests/cypress/e2e/variants.cy.js
+++ b/tests/cypress/e2e/variants.cy.js
@@ -25,6 +25,16 @@ const selectors = {
       .click()
   })
 
+  Cypress.Commands.add('checkTargetAnnotationLevel', (targetSelector, annotationLevel) => {
+    cy.get(selectors.panel3)
+      .find('#text-content')
+      .find(targetSelector)
+      .invoke('attr', 'data-annotation-level')
+      .should('eq', annotationLevel)
+  })
+
+
+
   Cypress.Commands.add('checkTextInWitnessItemDescription', (witness, description) => {
     cy
       .contains('h3', witness)
@@ -68,12 +78,12 @@ const selectors = {
 
       it('Should display third annotation tab', () => {
         cy
-            .get(selectors.tab)
-            .children()
-            .eq(2)
-            .parent()
-            .should('have.attr', 'data-p-active', 'true')
-            .should('contain','Variants')
+          .get(selectors.tab)
+          .children()
+          .eq(2)
+          .parent()
+          .should('have.attr', 'data-p-active', 'true')
+          .should('contain','Variants')
         });
 
       it('Should show a list of variant items', () => {
@@ -324,6 +334,20 @@ const selectors = {
           .should('eq', 'http://ahikar.uni-goettingen.de/ns/annotations/3r14z/annotation-variants-t_Brit_Mus_Add_7209_N1l5l3l5l5l29l4_w_3_0')
       })
 
+      it('Should change the highlighting level of the target when all its witnesses are deselected from the drop down', () => {
+        cy
+          .clickWitnessItem('4 Witnesses selected', 'DFM 614')
+          .parent().parent()
+          .contains('Ming. syr. 258').click()
+          .parent().parent()
+          .contains('Sach. 339').click()
+
+            // function: check annotation level of target
+          .checkTargetAnnotationLevel('#t_Brit_Mus_Add_7209_MD17104N1l5l3l7l5l41l2_3', '-1')
+          .checkTargetAnnotationLevel('#t_Brit_Mus_Add_7209_MD17104N1l5l3l7l5l43l2_2', '0')
+          .checkTargetAnnotationLevel('#t_Brit_Mus_Add_7209_MD17104N1l5l3l7l5l43l2_3', '0')
+      })
+
       it('Should show separation line correctly between annotation groups when deselecting witnesses from the witnesses drop down', () => {
         cy
           .clickWitnessItem('4 Witnesses selected', 'Ming. syr. 258')

From c01184f1394ef998017bb66206b3fc18f96a1588 Mon Sep 17 00:00:00 2001
From: orlinmalkja <orlin.malkja@sub.uni-goettingen.de>
Date: Wed, 30 Oct 2024 14:31:13 +0100
Subject: [PATCH 5/5] style: remove unused variable

---
 src/components/annotations/variants/VariantsList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/annotations/variants/VariantsList.vue b/src/components/annotations/variants/VariantsList.vue
index ac358459..28ecb486 100644
--- a/src/components/annotations/variants/VariantsList.vue
+++ b/src/components/annotations/variants/VariantsList.vue
@@ -36,7 +36,6 @@ const annotationStore = useAnnotationsStore();
 
 
 const activeAnnotations = computed<ActiveAnnotation>(() => annotationStore.activeAnnotations);
-const filteredAnnotations = computed<Annotation[]>(() => annotationStore.filteredAnnotations);
 const visibleAnnotations = computed<Annotation[]>(() => annotationStore.visibleAnnotations);