@konfuzio/document-validation-ui 0.1.17-dev.2 → 0.1.17-dev.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konfuzio/document-validation-ui",
-  "version": "0.1.17-dev.2",
+  "version": "0.1.17-dev.3",
   "repository": "git://github.com:konfuzio-ai/document-validation-ui.git",
   "main": "dist/app.js",
   "scripts": {

package/src/components/DocumentAnnotations/AnnotationRow.vue

@@ -7,7 +7,7 @@
       hoverPendingAnnotationRows && 'hovered-pending-annotations',
       annotationIsNotFound(annotationSet, label) && 'missing',
       isAnnotationInEditMode(annotationId()) && 'editing',
-      publicView && 'clickable-cursor'
+      publicView && 'clickable-cursor',
     ]"
     @click="onAnnotationClick"
     @mouseover="hoveredAnnotation = annotationId()"
@@ -39,25 +39,36 @@
       </div>
 
       <div v-if="showTranslationsDetails" class="annotation-translation">
-        <b-tooltip
-          :animated="false"
-          position="is-bottom"
-          :close-delay="2000"
-        >
+        <b-tooltip :animated="false" position="is-bottom" :close-delay="2000">
           <div class="icon">
-            <TranslateArrows :translation="annotation.translated_string && true"/>
+            <TranslateArrows
+              :translation="annotation.translated_string && true"
+            />
           </div>
 
-          <template #content> 
+          <template #content>
             <div class="translation-details">
               <div class="translation-title">
                 <span>{{ $t("translated_string_title") }}</span>
               </div>
-              <div  class="translation-info">
-                <span class="translated-string">{{ annotation.translated_string ? annotation.translated_string : $t("no_translated_string")}}</span>
-                <a v-if=!isDocumentReviewed class="annotation-details-link" @click="editAnnotationTranslation(annotation.id)">{{ annotation.translated_string ? $t("edit") : $t("add_translation")}}</a>
+              <div class="translation-info">
+                <span class="translated-string">{{
+                  annotation.translated_string
+                    ? annotation.translated_string
+                    : $t("no_translated_string")
+                }}</span>
+                <a
+                  v-if="!isDocumentReviewed"
+                  class="annotation-details-link"
+                  @click="editAnnotationTranslation(annotation.id)"
+                  >{{
+                    annotation.translated_string
+                      ? $t("edit")
+                      : $t("add_translation")
+                  }}</a
+                >
               </div>
-            </div> 
+            </div>
           </template>
         </b-tooltip>
       </div>
@@ -199,14 +210,12 @@ export default {
       "elementSelected",
       "selectedEntities",
     ]),
-    ...mapState("project", [
-      "translationsEnabled"
-    ]),
+    ...mapState("project", ["translationsEnabled"]),
     ...mapGetters("document", [
       "isAnnotationInEditMode",
       "annotationIsNotFound",
       "isDocumentReviewed",
-      "isNegative"
+      "isNegative",
     ]),
     defaultSpan() {
       if (
@@ -258,8 +267,13 @@ export default {
     },
     showTranslationsDetails() {
       // Only show translation option for filled annotations and if the feature is enabled for the project
-      return this.annotation && this.translationsEnabled && !this.publicView;
-    }
+      return (
+        this.annotation &&
+        !this.isNegative(this.annotation) &&
+        this.translationsEnabled &&
+        !this.publicView
+      );
+    },
   },
   watch: {
     sidebarAnnotationSelected(newSidebarAnnotationSelected) {
@@ -273,7 +287,11 @@ export default {
         annotationSelected = newSidebarAnnotationSelected;
       }
 
-      if (this.annotation && !this.isNegative(this.annotation) && this.annotation.id === annotationSelected.id) {
+      if (
+        this.annotation &&
+        !this.isNegative(this.annotation) &&
+        this.annotation.id === annotationSelected.id
+      ) {
         clearTimeout(this.annotationAnimationTimeout);
 
         let timeout;
@@ -347,7 +365,12 @@ export default {
     annotationId() {
       if (!this.annotationSet || !this.label) return;
 
-      if (this.annotation && this.annotation.id && !this.isNegative(this.annotation)) return this.annotation.id;
+      if (
+        this.annotation &&
+        this.annotation.id &&
+        !this.isNegative(this.annotation)
+      )
+        return this.annotation.id;
 
       let emptyAnnotationId;
 
@@ -388,9 +411,12 @@ export default {
         }
       );
       const found = labels.find((l) => l.id === this.label.id);
-      const negativeAnnotations = found.annotations.find(annotation => this.isNegative(annotation));
+      const negativeAnnotations = found.annotations.find((annotation) =>
+        this.isNegative(annotation)
+      );
 
-      if ((found && found.annotations.length === 0) || negativeAnnotations) return found.id;
+      if ((found && found.annotations.length === 0) || negativeAnnotations)
+        return found.id;
       return null;
     },
     hoveredNotCorrectAnnotations() {
@@ -407,7 +433,7 @@ export default {
       if (annotations.length === 0) return;
 
       const found = annotations.find(
-        (ann) => ann.id === this.annotation.id && !ann.revised
+        (ann) => ann.id === this.annotation.id && !ann.is_correct
       );
 
       if (found) {
@@ -494,7 +520,8 @@ export default {
 
       // Verify if we are editing a filled or empty annotation
       if (
-        this.annotation && !this.isNegative(this.annotation) &&
+        this.annotation &&
+        !this.isNegative(this.annotation) &&
         (this.showAcceptButton() ||
           this.showDeclineButton() ||
           this.isAnnotationInEditMode(
@@ -623,12 +650,15 @@ export default {
 
       // check if the annotation to create comes from a negative annotation
       // so we can create the new one and remove the negative one from the annotations array
-      if(this.isNegative(this.annotation)) {
+      if (this.isNegative(this.annotation)) {
         negativeAnnotationId = this.annotation.id;
       }
 
       this.$store
-        .dispatch("document/createAnnotation", {annotation: annotationToCreate, negativeAnnotationId: negativeAnnotationId})
+        .dispatch("document/createAnnotation", {
+          annotation: annotationToCreate,
+          negativeAnnotationId: negativeAnnotationId,
+        })
         .catch((error) => {
           this.$store.dispatch("document/createErrorMessage", {
             error,
@@ -697,14 +727,14 @@ export default {
       }
     },
     editAnnotationTranslation(annotationId) {
-      if(!annotationId) return;
+      if (!annotationId) return;
+
+      const baseUrl = api.FILE_URL ? api.FILE_URL : api.DEFAULT_URL;
 
-      const  baseUrl = api.FILE_URL ? api.FILE_URL : api.DEFAULT_URL;
-      
       const annotationDetailsUrl = `${baseUrl}/admin/server/sequenceannotation/${annotationId}/change/`;
 
       window.open(annotationDetailsUrl, "_blank");
-    }
+    },
   },
 };
 </script>

package/src/components/DocumentAnnotations/DocumentLabel.vue

@@ -15,7 +15,7 @@
           </div>
         </div>
         <div class="label-group-right">
-          <div v-if="!publicView" class="label-annotations-pending" >
+          <div v-if="!publicView" class="label-annotations-pending">
             {{
               `${
                 label.annotations.length - acceptedAnnotationsGroupCounter
@@ -149,7 +149,7 @@ export default {
   mounted() {
     this.updateValues();
 
-    if(this.publicView) {
+    if (this.publicView) {
       this.showAnnotationsGroup = true;
     }
   },
@@ -174,7 +174,7 @@ export default {
     labelHasPendingAnnotations(hoveredSet) {
       if (!hoveredSet) return;
 
-      const found = this.label.annotations.find((ann) => !ann.revised);
+      const found = this.label.annotations.find((ann) => !ann.is_correct);
 
       return this.annotationSet.id === hoveredSet.annotationSet.id && found;
     },

package/src/components/DocumentPage/NewAnnotation.vue

@@ -161,6 +161,7 @@ export default {
     ...mapGetters("document", [
       "numberOfAnnotationSetGroup",
       "labelsFilteredForAnnotationCreation",
+      "isNegative",
     ]),
     ...mapState("selection", ["spanSelection"]),
     top() {
@@ -247,8 +248,24 @@ export default {
         annotationToCreate.label_set = this.selectedSet.label_set.id;
       }
 
+      // check if the selected label already has a negative annotation
+      let negativeAnnotationId;
+
+      if (this.selectedLabel.annotations.length > 0) {
+        const negativeAnnotation = this.selectedLabel.annotations.find(
+          (annotation) => this.isNegative(annotation)
+        );
+
+        if (negativeAnnotation) {
+          negativeAnnotationId = negativeAnnotation.id;
+        }
+      }
+
       this.$store
-        .dispatch("document/createAnnotation", annotationToCreate)
+        .dispatch("document/createAnnotation", {
+          annotation: annotationToCreate,
+          negativeAnnotationId: negativeAnnotationId,
+        })
         .catch((error) => {
           this.$store.dispatch("document/createErrorMessage", {
             error,

package/src/components/DocumentTopBar/DocumentTopBar.cy.js

@@ -4,16 +4,16 @@ describe("Document Top Bar", () => {
 	let currentDocument;
 
 	beforeEach(() => {
-		cy.fetchDocument().then(() => {			
+		cy.fetchDocument().then(() => {
 			cy.getStore("document")
 				.then($document => {
 					currentDocument = $document.selectedDocument;
 				});
-	
+
 			cy.getStore("project")
 				.then($project => {
-				  cy.fetchCategories($project.projectId);
-			  });
+					cy.fetchCategories($project.projectId);
+				});
 		});
 		cy.dispatchAction("document", "setPublicView", false);
 		cy.dispatchAction("edit", "disableEditMode");
@@ -30,7 +30,7 @@ describe("Document Top Bar", () => {
 	});
 
 	it("Shows correct file name", () => {
-		const fileName = currentDocument.data_file_name
+		const fileName = currentDocument.data_file_name;
 
 		cy.get("#document-top-bar-component")
 			.find(".center-bar-components")
@@ -44,27 +44,27 @@ describe("Document Top Bar", () => {
 			.contains(fileName);
 	});
 
-	it("Shows arrows if available documents to navigate to", () => {		
+	it("Shows arrows if available documents to navigate to", () => {
 		cy.fetchDocumentList();
 		const assignee = currentDocument.assignee;
-		
+
 		cy.getStore("project")
-      .then($project => {
+			.then($project => {
 				cy.gettersStore().then(($getters) => {
 					const filtered = $project.documentsInProject.filter(
 						(document) =>
 							($getters["document/waitingForSplittingConfirmation"](document) || $getters["document/isDocumentReadyToBeReviewed"](document)
-							) && document.assignee === assignee 
+							) && document.assignee === assignee
 					);
 
-					if(filtered.length > 0) {
+					if (filtered.length > 0) {
 						cy.get("#document-top-bar-component")
-						.find(".center-bar-components")
-						.find(".navigation-arrow")
-						.should("be.visible");
+							.find(".center-bar-components")
+							.find(".navigation-arrow")
+							.should("be.visible");
 					}
+				});
 			});
-		});
 	});
 
 	it("Shows keyboard icon", () => {
@@ -74,7 +74,7 @@ describe("Document Top Bar", () => {
 			.should("be.visible");
 	});
 
-	it("Shows disabled finish review button", () => {		
+	it("Shows disabled finish review button", () => {
 		cy.get("#document-top-bar-component")
 			.find(".right-bar-components")
 			.find(".top-bar-buttons")
@@ -106,7 +106,7 @@ describe("Document Top Bar", () => {
 	});
 
 	it("Edits file name", () => {
-		const fileName = currentDocument.data_file_name.split(".").slice(0, -1).join(".");
+		const newName = "test-name";
 
 		cy.get("#document-top-bar-component")
 			.find(".center-bar-components")
@@ -119,15 +119,15 @@ describe("Document Top Bar", () => {
 			.find(".document-name-component")
 			.find(".document-name")
 			.should("have.class", "is-editable");
-		
+
 		cy.get("#document-top-bar-component")
 			.find(".center-bar-components")
 			.find(".document-name-component")
 			.find(".document-name")
 			.type('{selectAll}')
 			.type('{backspace}')
-			.type("test-name");
-		
+			.type(newName);
+
 		cy.get("#document-top-bar-component")
 			.find(".center-bar-components")
 			.find(".document-name-component")
@@ -141,7 +141,7 @@ describe("Document Top Bar", () => {
 			.click();
 
 		cy.wait(1000);
-		
+
 		cy.get("#document-top-bar-component")
 			.find(".center-bar-components")
 			.find(".document-name-component")
@@ -153,7 +153,7 @@ describe("Document Top Bar", () => {
 		cy.get("#document-top-bar-component")
 			.find(".center-bar-components")
 			.find(".document-name-component")
-			.contains(fileName);
+			.contains(newName);
 	});
 
 	it("Shows tooltip when hovering over keyboard info", () => {
@@ -167,14 +167,14 @@ describe("Document Top Bar", () => {
 			.find(".keyboard-actions-info")
 			.find(".keyboard-actions-description")
 			.should("be.visible");
-		
+
 		cy.get("#document-top-bar-component")
 			.find(".right-bar-components")
 			.find(".keyboard-actions-info")
 			.trigger("mouseleave");
 	});
 
-	it("Closes edit mode when clicking 'back to annotaiton view' button", () => {	
+	it("Closes edit mode when clicking 'back to annotaiton view' button", () => {
 		cy.dispatchAction("edit", "enableEditMode");
 
 		cy.get("#document-top-bar-component")

package/src/components/DocumentTopBar/DocumentTopBarButtons.vue

@@ -21,7 +21,10 @@
         <b-button
           :label="editMode && !renameAndCategorize ? $t('next') : $t('submit')"
           type="is-primary"
-          :class="['button-next primary-button edit-mode-btn', renameAndCategorize && 'submit-btn']"
+          :class="[
+            'button-next primary-button edit-mode-btn',
+            renameAndCategorize && 'submit-btn',
+          ]"
           :disabled="renameAndCategorize && !enableSubmit"
           @click="handleButton"
         />

package/src/store/document.js

@@ -117,30 +117,37 @@ const getters = {
   /**
    * Gets labels for an annotation creation from a label/annotation set
    */
-  labelsFilteredForAnnotationCreation: (state) => (set) => {
-    let returnLabels = [];
+  labelsFilteredForAnnotationCreation: (_, getters) => (set) => {
+    let availableLabels = [];
     if (set.id && set.labels) {
-      // if existing ann set, check for multiple
-      returnLabels = set.labels.filter((label) => {
-        // check if label has multiple and if not, if there's already an annotation created
-        if (!label.has_multiple_top_candidates) {
-          const existingLabel = state.labels.find((documentLabel) => {
-            return documentLabel.id === label.id;
-          });
-          return (
-            existingLabel &&
-            existingLabel.annotations &&
-            existingLabel.annotations.length === 0
-          );
+      // check if label can be multiple, if there's already an annotation created & if it's a negative annotation
+      set.labels.map(label => {
+        // check if we already added the same label to the array
+        const found = availableLabels.find(l => l.id === label.id);
+
+        if (found) return;
+
+        if (label.annotations.length === 0) {
+          availableLabels.push(label);
         } else {
-          return true;
+          if (label.has_multiple_top_candidates) {
+            availableLabels.push(label);
+          } else {
+            // if the label has negative annotations, we show the label
+            label.annotations.map(annotation => {
+              if (getters.isNegative(annotation)) {
+                availableLabels.push(label);
+              }
+            });
+          }
+
         }
       });
     } else if (set.labels) {
       // if not existing ann set, then return all labels
-      returnLabels = set.labels;
+      availableLabels = set.labels;
     }
-    return returnLabels;
+    return availableLabels;
   },
 
   /* Checks if annotation is in deleted state */
@@ -248,7 +255,7 @@ const getters = {
     const labels = [];
     const processedAnnotationSets = annotationSets.map((annotationSet) => {
       const annotationSetLabels = annotationSet.labels.map((label) => {
-      
+
         // add annotations to the document array
         annotations.push(...label.annotations);
         labels.push(label);
@@ -328,7 +335,7 @@ const getters = {
         // check which one has more confidence or if it's the same, then check if one is revised or not
         if (
           highestConfidenceAnnotation.confidence <
-            label.annotations[i].confidence ||
+          label.annotations[i].confidence ||
           (highestConfidenceAnnotation.confidence ===
             label.annotations[i].confidence &&
             label.annotations[i].revised)
@@ -353,17 +360,17 @@ const getters = {
    */
   isAnnotationInEditMode:
     (state) =>
-    (annotationId, index = null) => {
-      if (state.editAnnotation && annotationId) {
-        if (index != null) {
-          return (
-            state.editAnnotation.id === annotationId &&
-            state.editAnnotation.index === index
-          );
+      (annotationId, index = null) => {
+        if (state.editAnnotation && annotationId) {
+          if (index != null) {
+            return (
+              state.editAnnotation.id === annotationId &&
+              state.editAnnotation.index === index
+            );
+          }
+          return state.editAnnotation.id === annotationId;
         }
-        return state.editAnnotation.id === annotationId;
-      }
-    },
+      },
 
   /**
    * Get number of empty labels per annotation set
@@ -379,7 +386,7 @@ const getters = {
           annotationSet.label_set.id === l.label_set
       );
 
-      const foundNegative = label.annotations.find(annotation => 
+      const foundNegative = label.annotations.find(annotation =>
         getters.isNegative(annotation)
       );
 
@@ -433,18 +440,22 @@ const getters = {
 
     if (state.annotations) {
       notCorrect = state.annotations.filter((a) => !a.is_correct);
+
+      if (notCorrect) {
+        notCorrect.map(annotation => {
+          emptyAnnotations.push(annotation);
+        });
+      }
     }
 
-    // if all annotations have been revised
+    // if all annotations are correct
     // and if there are no empty annotations or
-    // all empty annotations were marked as missing,
+    // all empty annotations or negative annotations were marked as missing,
     // we can finish the review
     if (
       !emptyAnnotations ||
       !state.missingAnnotations ||
-      !notCorrect ||
-      (notCorrect.length === 0 &&
-        state.missingAnnotations.length === emptyAnnotations.length)
+      state.missingAnnotations.length === emptyAnnotations.length
     ) {
       return true;
     }
@@ -506,14 +517,14 @@ const getters = {
    */
   documentCannotBeEdited:
     (state) =>
-    (document = state.selectedDocument) => {
-      return (
-        document.dataset_status === 1 ||
-        document.dataset_status === 2 ||
-        document.dataset_status === 3 ||
-        document.is_reviewed
-      );
-    },
+      (document = state.selectedDocument) => {
+        return (
+          document.dataset_status === 1 ||
+          document.dataset_status === 2 ||
+          document.dataset_status === 3 ||
+          document.is_reviewed
+        );
+      },
 
   /**
    * If automatic splitting is enabled for the project
@@ -580,8 +591,8 @@ const getters = {
     }
   },
   isNegative: () => (annotation) => {
-    if(annotation) {
-      return !annotation.is_correct && annotation.revised
+    if (annotation) {
+      return !annotation.is_correct && annotation.revised;
     } else {
       return null;
     }
@@ -731,7 +742,7 @@ const actions = {
           commit("SET_LABELS", labels);
           commit("SET_SELECTED_DOCUMENT", response.data);
 
-          if(response.data.project) {
+          if (response.data.project) {
             projectId = response.data.project;
 
             dispatch("project/setProjectId", projectId, {
@@ -840,7 +851,7 @@ const actions = {
     commit("SET_DOCUMENT_ANNOTATION_SELECTED", null);
   },
 
-  createAnnotation: ({ commit, getters, dispatch }, {annotation, negativeAnnotationId}) => {
+  createAnnotation: ({ commit, getters, dispatch }, { annotation, negativeAnnotationId }) => {
     return new Promise((resolve, reject) => {
       HTTP.post(`/annotations/`, annotation)
         .then(async (response) => {
@@ -858,7 +869,7 @@ const actions = {
               }
             } else {
               commit("ADD_ANNOTATION", response.data);
-              if(negativeAnnotationId) {
+              if (negativeAnnotationId) {
                 commit("DELETE_ANNOTATION", negativeAnnotationId);
               }
             }
@@ -1156,7 +1167,7 @@ const mutations = {
             const exists = label.annotations.find(
               (existingAnnotation) => existingAnnotation.id === annotation.id
             );
-            
+
             if (!exists) {
               label.annotations.push(annotation);
               return;