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

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/DocumentEdit/DocumentEdit.cy.js

@@ -137,7 +137,7 @@ describe("Document Edit", () => {
       const pages = $document.selectedDocument.pages;
       const pagesLength = pages.length;
 
-      if (!$document.selectedDocument.proposed_split) {
+      if (!$document.selectedDocument.proposed_split && $document.pages.length > 1) {
         cy.get("#document-edit")
           .find(".pages-section")
           .find(".image-section")
@@ -154,27 +154,29 @@ describe("Document Edit", () => {
 
   it("Clicking splitting lines creates new documents", () => {
     cy.getStore("document").then(($document) => {
-      if ($document.selectedDocument.proposed_split) {
+      if ($document.pages.length > 1) {
+        if ($document.selectedDocument.proposed_split) {
+          cy.get("#document-edit")
+            .find(".sidebar")
+            .find(".smart-split")
+            .find(".split-switch")
+            .click();
+
+          cy.wait(1000);
+        }
+
         cy.get("#document-edit")
-          .find(".sidebar")
-          .find(".smart-split")
-          .find(".split-switch")
+          .find(".pages-section")
+          .find(".image-section")
+          .find(".splitting-lines")
+          .find(".lines")
+          .first()
           .click();
 
-        cy.wait(1000);
+        cy.getStore("edit").then(($edit) => {
+          expect($edit.updatedDocument).to.have.lengthOf(2);
+        });
       }
-
-      cy.get("#document-edit")
-        .find(".pages-section")
-        .find(".image-section")
-        .find(".splitting-lines")
-        .find(".lines")
-        .first()
-        .click();
-
-      cy.getStore("edit").then(($edit) => {
-        expect($edit.updatedDocument).to.have.lengthOf(2);
-      });
     });
   });
 

package/src/components/DocumentPage/DocumentPage.vue

@@ -154,6 +154,7 @@ export default {
 
   computed: {
     ...mapState("display", ["currentPage", "showAnnSetTable"]),
+    ...mapGetters("document", ["isNegative"]),
 
     isBoxSelection() {
       return this.selection && !this.isSelecting && this.isElementSelected;
@@ -231,7 +232,7 @@ export default {
           if (
             annotation.span.find(
               (span) => span.page_index + 1 === this.page.number
-            )
+            ) && !this.isNegative(annotation)
           ) {
             annotations.push(annotation);
           }

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/locales/de.json

@@ -140,5 +140,8 @@
   "link_to_add_labels": "Sehen Sie <a href='https://help.konfuzio.com/modules/labels/index.html#add-a-label' target='_blank'>hier</a>, wie Sie sie hinzufügen.",
   "no_annotations_in_annotation_set": "Dieser Annotationssatz enthält keine extrahierten Annotationen für die jeweiligen Beschriftungen.",
   "wait_title": "Bitte warten...",
-  "redirecting_to_documents_list": "Wir führen Sie zur Dokumentenliste, sodass Sie Ihre Dokumente weiter überprüfen können, während wir die vorgenommenen Änderungen verarbeiten."
+  "redirecting_to_documents_list": "Wir führen Sie zur Dokumentenliste, sodass Sie Ihre Dokumente weiter überprüfen können, während wir die vorgenommenen Änderungen verarbeiten.",
+  "translated_string_title": "Übersetzter Text",
+  "no_translated_string": "Es existiert noch keine Übersetzung.",
+  "add_translation": "Eins hinzufügen"
 }

package/src/locales/en.json

@@ -140,5 +140,8 @@
   "link_to_add_labels": "See how to add them <a href='https://help.konfuzio.com/modules/labels/index.html#add-a-label' target='_blank'>here</a>.",
   "no_annotations_in_annotation_set": "This annotation set has no annotations extracted for its respective labels.",
   "wait_title": "Please wait...",
-  "redirecting_to_documents_list": "We are taking you to the documents list, so you can continue reviewing your documents while we process the changes made."
+  "redirecting_to_documents_list": "We are taking you to the documents list, so you can continue reviewing your documents while we process the changes made.",
+  "translated_string_title": "Translated text",
+  "no_translated_string": "No translation exists yet.",
+  "add_translation": "Add one"
 }

package/src/locales/es.json

@@ -140,5 +140,8 @@
   "link_to_add_labels": "Para ver cómo agregarlas haga clic <a href='https://help.konfuzio.com/modules/labels/index.html#add-a-label' target='_blank'>aquí</a>.",
   "no_annotations_in_annotation_set": "Este grupo de anotaciones no tiene anotaciones encontradas para sus respectivas etiquetas.",
   "wait_title": "Por favor espere...",
-  "redirecting_to_documents_list": "Lo estamos redirigiendo a la lista de documentos, para que pueda continuar la revisión de sus documentos mientras procesamos los cambios realizados."
+  "redirecting_to_documents_list": "Lo estamos redirigiendo a la lista de documentos, para que pueda continuar la revisión de sus documentos mientras procesamos los cambios realizados.",
+  "translated_string_title": "Texto traducido",
+  "no_translated_string": "Aún no existe traducción.",
+  "add_translation": "Agregar"
 }

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,6 +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);
@@ -327,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)
@@ -352,42 +360,43 @@ 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
    */
-  emptyLabelsLength: (state) => (annotationSet) => {
-    const labels = annotationSet.labels.filter(
-      (label) => label.annotations.length === 0
-    );
-
+  emptyLabels: (state, getters) => (annotationSet) => {
     const pendingEmpty = [];
 
-    labels.map((label) => {
-      const found = state.missingAnnotations.find(
+    annotationSet.labels.map((label) => {
+      const foundMissing = state.missingAnnotations.find(
         (l) =>
           l.label === label.id &&
           annotationSet.id === l.annotation_set &&
           annotationSet.label_set.id === l.label_set
       );
 
-      if (!found) {
+      const foundNegative = label.annotations.find(annotation =>
+        getters.isNegative(annotation)
+      );
+
+      if (!foundMissing && (label.annotations.length === 0 || foundNegative)) {
         pendingEmpty.push(label);
       }
+
     });
 
-    return pendingEmpty.length;
+    return pendingEmpty;
   },
 
   annotationIsNotFound: (state) => (annotationSet, label) => {
@@ -408,8 +417,8 @@ const getters = {
 
   // Check if document is ready to be finished
   isDocumentReadyToFinishReview: (state) => {
-    // check if all annotations have been revised
-    let notRevised;
+    // check if all annotations are correct
+    let notCorrect;
 
     const emptyAnnotations = [];
 
@@ -430,19 +439,23 @@ const getters = {
     }
 
     if (state.annotations) {
-      notRevised = state.annotations.filter((a) => !a.revised);
+      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 ||
-      !notRevised ||
-      (notRevised.length === 0 &&
-        state.missingAnnotations.length === emptyAnnotations.length)
+      state.missingAnnotations.length === emptyAnnotations.length
     ) {
       return true;
     }
@@ -456,7 +469,7 @@ const getters = {
   /**
    * Get number of annotations pending review per annotation set
    */
-  annotationsWithPendingReviewLength: () => (annotationSet) => {
+  notCorrectAnnotations: () => (annotationSet) => {
     const labels = annotationSet.labels.filter(
       (label) => label.annotations.length > 0
     );
@@ -465,7 +478,7 @@ const getters = {
 
     labels.map((label) => {
       const foundPendingAnnotations = label.annotations.filter(
-        (ann) => !ann.revised
+        (ann) => !ann.is_correct && !ann.revised
       );
 
       if (foundPendingAnnotations && foundPendingAnnotations.length > 0) {
@@ -480,7 +493,7 @@ const getters = {
       }
     });
 
-    return annotationsWithPendingReview.length;
+    return annotationsWithPendingReview;
   },
 
   /**
@@ -504,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
@@ -577,6 +590,13 @@ const getters = {
       return null;
     }
   },
+  isNegative: () => (annotation) => {
+    if (annotation) {
+      return !annotation.is_correct && annotation.revised;
+    } else {
+      return null;
+    }
+  },
 
   /**
    * Check for user who created or revised the annotation
@@ -722,11 +742,13 @@ const actions = {
           commit("SET_LABELS", labels);
           commit("SET_SELECTED_DOCUMENT", response.data);
 
-          if (rootState.project.projectId) {
-            projectId = rootState.project.projectId;
-          } else {
+          if (response.data.project) {
             projectId = response.data.project;
-            dispatch("project/setProjectId", response.data.project, {
+
+            dispatch("project/setProjectId", projectId, {
+              root: true,
+            });
+            dispatch("project/fetchProjectDetails", projectId, {
               root: true,
             });
           }
@@ -829,7 +851,7 @@ const actions = {
     commit("SET_DOCUMENT_ANNOTATION_SELECTED", null);
   },
 
-  createAnnotation: ({ commit, getters, dispatch }, annotation) => {
+  createAnnotation: ({ commit, getters, dispatch }, { annotation, negativeAnnotationId }) => {
     return new Promise((resolve, reject) => {
       HTTP.post(`/annotations/`, annotation)
         .then(async (response) => {
@@ -847,6 +869,9 @@ const actions = {
               }
             } else {
               commit("ADD_ANNOTATION", response.data);
+              if (negativeAnnotationId) {
+                commit("DELETE_ANNOTATION", negativeAnnotationId);
+              }
             }
 
             resolve(response);
@@ -1142,6 +1167,7 @@ const mutations = {
             const exists = label.annotations.find(
               (existingAnnotation) => existingAnnotation.id === annotation.id
             );
+
             if (!exists) {
               label.annotations.push(annotation);
               return;

package/src/store/project.js

@@ -2,10 +2,11 @@ import myImports from "../api";
 const HTTP = myImports.HTTP;
 
 const state = {
-  projectId: process.env.VUE_APP_PROJECT_ID,
+  projectId: null,
   currentUser: null,
   documentsListPath: null,
   documentsInProject: null,
+  translationsEnabled: false,
 };
 
 const getters = {
@@ -99,6 +100,20 @@ const actions = {
         console.log(error, "Could not fetch document list from the backend");
       });
   },
+
+  fetchProjectDetails: ({commit}, projectId) => {
+    return HTTP.get(
+      `projects/${projectId}/`
+    )
+      .then((response) => {
+        if (response.data.enable_translated_strings) {
+          commit("SET_TRANSLATIONS_ENABLED", true);
+        }
+      })
+      .catch((error) => {
+        console.log(error, "Could not fetch project details from the backend");
+      });
+  }
 };
 
 const mutations = {
@@ -114,6 +129,9 @@ const mutations = {
   SET_DOCUMENTS_IN_PROJECT: (state, documents) => {
     state.documentsInProject = documents;
   },
+  SET_TRANSLATIONS_ENABLED: (state, value) => {
+    state.translationsEnabled = value;
+  }
 };
 
 export default {

package/src/assets/images/UserIcon.vue

@@ -1,8 +0,0 @@
-<template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-    <path
-      fill="#E1E1E1"
-      d="M15.71,12.71a6,6,0,1,0-7.42,0,10,10,0,0,0-6.22,8.18,1,1,0,0,0,2,.22,8,8,0,0,1,15.9,0,1,1,0,0,0,1,.89h.11a1,1,0,0,0,.88-1.1A10,10,0,0,0,15.71,12.71ZM12,12a4,4,0,1,1,4-4A4,4,0,0,1,12,12Z"
-    />
-  </svg>
-</template>