@konfuzio/document-validation-ui 0.1.8 → 0.1.9-pre-release-1

package/src/components/DocumentDashboard.vue

@@ -36,7 +36,9 @@
     </div>
     <div
       v-if="
-        selectedDocument && waitingForSplittingConfirmation(selectedDocument)
+        selectedDocument &&
+        waitingForSplittingConfirmation(selectedDocument) &&
+        !documentBeingSplit
       "
     >
       <SplittingSuggestionsModal />
@@ -101,10 +103,11 @@ export default {
       "selectedDocument",
       "splittingSuggestions",
     ]),
-    ...mapState("edit", ["editMode", "splitOverview"]),
+    ...mapState("edit", ["editMode", "splitOverview", "documentBeingSplit"]),
     ...mapGetters("display", ["isMinimumWidth"]),
     ...mapGetters("document", ["waitingForSplittingConfirmation"]),
   },
+
   watch: {
     selectedDocument(newDocument, oldDocument) {
       if (newDocument && !oldDocument) {

package/src/components/DocumentEdit/DocumentEdit.vue

@@ -231,7 +231,11 @@ export default {
       const newPage = { page: page, origin: origin };
       const removedPage = { page: 0, origin: origin };
 
-      if (
+      if (this.splitSuggestionsEnabled && origin === "AI") {
+        // if manual suggestions were added but we enable automatic splitting,
+        // this last one takes over
+        this.splittingLines.splice(page - 1, 1, newPage);
+      } else if (
         page === this.splittingLines.length ||
         (!this.splitSuggestionsEnabled && !found && origin === "AI")
       ) {
@@ -239,10 +243,6 @@ export default {
         // Or if splitting is switched off, but some of the suggestion lines
         // were removed manually
         return;
-      } else if (this.splitSuggestionsEnabled && origin === "AI") {
-        // if manual suggestions were added but we enable automatic splitting,
-        // this last one takes over
-        this.splittingLines.splice(page - 1, 1, newPage);
       } else if (found) {
         // If splitting is switched off and we have manual splits,
         // those should stay unchanged

package/src/components/DocumentPage/BoxSelection.vue

@@ -102,7 +102,10 @@ export default {
         this.selection.start,
         this.selection.end
       );
-      this.$store.dispatch("selection/getTextFromBboxes", box);
+      this.$store.dispatch("selection/getTextFromBboxes", {
+        box,
+        entities: false,
+      });
     },
 
     /**

package/src/components/DocumentPage/DocumentPage.vue

@@ -221,7 +221,6 @@ export default {
           scaled: {
             ...box,
           },
-          clickSelected: false,
         };
       });
     },
@@ -258,6 +257,7 @@ export default {
       "isSelecting",
       "selectionFromBbox",
       "spanSelection",
+      "selectedEntities",
     ]),
     ...mapState("display", [
       "scale",
@@ -271,7 +271,6 @@ export default {
       "editAnnotation",
       "selectedDocument",
       "publicView",
-      "selectedEntities",
     ]),
     ...mapState("edit", ["editMode"]),
     ...mapGetters("display", ["visiblePageRange", "bboxToRect"]),
@@ -292,10 +291,13 @@ export default {
     scale() {
       this.closePopups(true);
     },
-    selectedEntities(newValue) {
+    async selectedEntities(newValue) {
       if (!newValue) {
+        this.$store.dispatch("selection/setSpanSelection", null);
         this.closePopups(true);
       }
+
+      await this.$store.dispatch("selection/getTextFromEntities", newValue);
     },
     page(newValue, oldValue) {
       if (newValue.image_url !== oldValue.image_url) {
@@ -406,24 +408,22 @@ export default {
         return;
 
       // Check if we are creating a new Annotation
-      // or if we are editing an existing or empty one
-      const entityToAdd = {
-        entity,
-        content: entity.original.offset_string,
-      };
+      // or if we are removing a previously selected entity
+      // or editing empty one
+      const entityToAdd = entity;
 
       const found = this.newAnnotation.find(
         (ann) =>
-          ann.entity.scaled.width === entityToAdd.entity.scaled.width &&
-          ann.content === entityToAdd.content
+          ann.scaled.width === entityToAdd.scaled.width &&
+          ann.original.offset_string === entityToAdd.original.offset_string
       );
 
       if (found) {
         this.newAnnotation = [
           ...this.newAnnotation.filter(
             (ann) =>
-              ann.entity.scaled.width !== entityToAdd.entity.scaled.width &&
-              ann.content !== entityToAdd.content
+              ann.scaled.width !== entityToAdd.scaled.width &&
+              ann.original.offset_string !== entityToAdd.original.offset_string
           ),
         ];
       } else {
@@ -432,11 +432,11 @@ export default {
 
       if (this.newAnnotation.length > 0) {
         this.$store.dispatch(
-          "document/setSelectedEntities",
+          "selection/setSelectedEntities",
           this.newAnnotation
         );
       } else {
-        this.$store.dispatch("document/setSelectedEntities", null);
+        this.$store.dispatch("selection/setSelectedEntities", null);
       }
     },
 
@@ -492,10 +492,10 @@ export default {
       if (this.newAnnotation && this.newAnnotation.length > 0) {
         entityIsSelected = this.newAnnotation.find((selectedEntity) => {
           return (
-            selectedEntity.entity.original.offset_string ===
+            selectedEntity.original.offset_string ===
               entity.original.offset_string &&
-            selectedEntity.entity.original.x0 === entity.original.x0 &&
-            selectedEntity.entity.original.y0 === entity.original.y0
+            selectedEntity.original.x0 === entity.original.x0 &&
+            selectedEntity.original.y0 === entity.original.y0
           );
         });
       }

package/src/components/DocumentPage/NewAnnotation.vue

@@ -110,7 +110,7 @@
         type="is-primary"
         class="popup-button primary-button"
         :label="$t('save')"
-        :disabled="loading || !getTextFromEntities || !selectedLabel"
+        :disabled="loading || !spanSelection || !selectedLabel"
         @click.prevent="save"
       />
     </div>
@@ -158,22 +158,22 @@ export default {
     ...mapGetters("document", [
       "numberOfAnnotationSetGroup",
       "labelsFilteredForAnnotationCreation",
-      "getTextFromEntities",
     ]),
+    ...mapState("selection", ["spanSelection"]),
     top() {
-      const top = this.newAnnotation[0].entity.scaled.y - heightOfPopup; // subtract the height of the popup plus some margin
+      const top = this.newAnnotation[0].scaled.y - heightOfPopup; // subtract the height of the popup plus some margin
 
       //check if the popup will not go off the container on the top
-      return this.newAnnotation[0].entity.scaled.y > heightOfPopup
+      return this.newAnnotation[0].scaled.y > heightOfPopup
         ? top
-        : this.newAnnotation[0].entity.scaled.y +
-            this.newAnnotation[0].entity.scaled.height +
+        : this.newAnnotation[0].scaled.y +
+            this.newAnnotation[0].scaled.height +
             margin;
     },
     left() {
       const left =
-        this.newAnnotation[0].entity.scaled.x +
-        this.newAnnotation[0].entity.scaled.width / 2 -
+        this.newAnnotation[0].scaled.x +
+        this.newAnnotation[0].scaled.width / 2 -
         widthOfPopup / 2; // add the entity half width to be centered and then subtract half the width of the popup
 
       //check if the popup will not go off the container
@@ -186,7 +186,15 @@ export default {
       }
     },
     textFromEntities() {
-      return this.getTextFromEntities();
+      if (!this.spanSelection) return;
+
+      // get array of all offset strings
+      let text = this.spanSelection.map((span) => {
+        return span.offset_string;
+      });
+
+      // join all the strings to become a single string of text
+      return text.join().split(",").join(" ");
     },
   },
   watch: {
@@ -210,13 +218,16 @@ export default {
   },
   methods: {
     close() {
-      this.$store.dispatch("document/setSelectedEntities", null);
+      this.$store.dispatch("selection/setSelectedEntities", null);
       this.$emit("close");
     },
     save() {
       this.loading = true;
       const span = this.newAnnotation.flatMap((ann) => {
-        return { ...ann.entity.original, offset_string: ann.content };
+        return {
+          ...ann.original,
+          offset_string: ann.original.offset_string,
+        };
       });
 
       const annotationToCreate = {

package/src/locales/de.json

@@ -3,7 +3,7 @@
   "no_label_sets_found_description": "In diesem Dokument sind keine Label Sets vorhanden.",
   "no_labels_found": "Keine Labels vorhanden",
   "no_labels_description": "In diesem Label Set sind keine Labels vorhanden.",
-  "resolution_not_supported": "Die App wird bei dieser Auflösung nicht unterstützt",
+  "resolution_not_supported": "Die aktuelle Auflösung wird nicht unterstützt",
   "upload_documents": "Laden Sie Ihre Dokumente hoch",
   "request_trial": "Fordern Sie Ihren Probezugang an",
   "warning_message": "Die KI kann nicht trainiert werden, wenn Sie den Text manuell ändern.",
@@ -26,11 +26,11 @@
   "invalid_email": "Bitte geben Sie eine gültige E-Mail-Adresse ein.",
   "members": "Mitglieder",
   "select": "Auswählen",
-  "document_successfully_handed": "Dokument erfolgreich übergeben an",
-  "handover_not_possible": "Eine Übergabe war nicht möglich. Bitte versuchen Sie es später erneut.",
-  "small_viewport_title": "Kleine Ansichtsfenstergröße",
-  "small_viewport_info": "Es tut uns leid, aber Konfuzio ist nicht für diese Ansichtsfenstergröße optimiert. Für eine bessere Bedienbarkeit öffnen Sie es bitte in einem größeren Ansichtsfenster.",
-  "ok": "Ok, verstanden",
+  "document_successfully_handed": "Dokument erfolgreich zugewiesen an",
+  "handover_not_possible": "Eine Zuweisung war nicht möglich. Bitte versuchen Sie es später erneut.",
+  "small_viewport_title": "Kleine Fenstergröße",
+  "small_viewport_info": "Es tut uns leid, aber Konfuzio ist nicht für diese Fenstergröße optimiert. Für eine bessere Bedienbarkeit öffnen Sie es bitte in einem größeren Ansichtsfenster.",
+  "ok": "Ok",
   "no_data_found": "Zum Bearbeiten anklicken...",
   "draw_box_document": "Find <i>{label_name}</i> in the document",
   "confidence": "Konfidenz",
@@ -52,9 +52,10 @@
   "missing_annotation": "Als fehlend markieren",
   "ann_exists": "Eine Annotation für dieses Label und Label-Set existiert bereits.",
   "lite_mode": "Schreibgeschützt",
-  "limited_functionalities": "Sie verwenden die schreibgeschützte Version mit begrenzten Funktionalitäten.",
+  "limited_functionalities": "Sie verwenden die schreibgeschützte Version mit begrenzte Funktionalität.",
   "split": "Aufteilen",
-  "reorder": "Umsortieren",
+  "reorder": "Sortieren",
+  "rotate": "Rotieren",
   "edit_error": "Die Änderungen konnten nicht gespeichert werden. Bitte versuchen Sie es später erneut.",
   "overview": "Übersicht",
   "select_pages": "Sie können nun Seiten drehen, neu sortieren und Dokumente splitten.",
@@ -116,7 +117,7 @@
   "split_modal_title": "Dokument aufteilen",
   "split_modal_body": "Wir haben Ihre Datei gescannt und <strong>{number_of_split_documents}</strong> verschiedene Dokumente gefunde. <strong>Wir empfehlen dringend,</strong> sie zu diesem Zeitpunkt aufzuteilen, da sonst alle Fortschritte, die Sie gemacht haben, aufgrund der erneuten Extraktion der Dokumentdaten verloren gehen.",
   "do_it_later": "Ich werde es später machen",
-  "review_now": "Jetzt reviewen",
+  "review_now": "Jetzt überprüfen",
   "recommended": "Empfohlen",
   "smart_split": "Smart Split",
   "smart_split_suggestions": "Unsere Smart Split-Vorschläge sind grün hervorgehoben",
@@ -125,10 +126,10 @@
   "splitting_warning": "Beachten Sie bitte, dass alle Annotationen, die Sie in diesem Dokument gemacht haben, nicht gespeichert werden, wenn Sie fortfahren.",
   "no": "Nein",
   "yes": "Ja",
-  "split_modal_no_suggestions": "Do you need to split the document? <strong>We strongly recommend</strong> splitting it at this stage, otherwise all the progress you’ve made will be lost in the future.",
+  "split_modal_no_suggestions": "Soll das Dokument geteilt werden? Wir <strong>empfehlen</strong> das Dokument jetzt zuteilen, da sonst alle Fortschritte, die in der Zwischenzeit gemacht werden,verloren gehen.",
   "missing_from_document": "Fehlt im Dokument",
-  "edit_label": "Edit label",
-  "delete_label": "Delete label",
-  "table": "Table",
-  "delete_table": "Delete table"
+  "edit_label": "Label editieren",
+  "delete_label": "Label löschen",
+  "table": "Tabelle",
+  "prepare_document": "Dokument vorbereiten"
 }

package/src/locales/en.json

@@ -131,6 +131,5 @@
   "missing_from_document": "Missing from the document",
   "edit_label": "Edit label",
   "delete_label": "Delete label",
-  "table": "Table",
-  "delete_table": "Delete table"
+  "table": "Table"
 }

package/src/locales/es.json

@@ -124,10 +124,12 @@
   "splitting_warning": "Ten en cuenta que se perderán las anotaciones que hayas confirmado en el documento.",
   "no": "No",
   "yes": "Sí",
-  "split_modal_no_suggestions": "Do you need to split the document? <strong>We strongly recommend</strong> splitting it at this stage, otherwise all the progress you’ve made will be lost in the future.",
+  "split_modal_no_suggestions": "¿Necesitas dividir el documento? <strong>Te recomendamos</strong> hacerlo en este momento, o de lo contrario se perderán los cambios realizados.",
   "missing_from_document": "Falta en el documento",
   "edit_label": "Edit label",
   "delete_label": "Delete label",
   "table": "Table",
-  "delete_table": "Delete table"
+  "new_multi_ann_description": "Selecciona un modelo de datos de los existentes, luego deselecciona las etiquetas que no existen en este documento.",
+  "new_multi_ann_title": "Crear múltiples anotaciones",
+  "prepare_document": "Prepara el documento"
 }

package/src/store/category.js

@@ -102,7 +102,7 @@ const actions = {
               state.documentsInProject[i]
             )
           ) {
-            dispatch("document/setDocumentError", true);
+            dispatch("document/setDocumentError", null, { root: true });
             // If error, add 1
             // Then go to next item
             errors += 1;

package/src/store/document.js

@@ -26,7 +26,6 @@ const state = {
   errorMessageWidth: null,
   hoveredAnnotationSet: null,
   newAcceptedAnnotations: null,
-  selectedEntities: null,
   serverError: false,
   splittingSuggestions: null,
 };
@@ -394,12 +393,7 @@ const getters = {
           el.annotation_set === annotationSet.id &&
           el.label_set === annotationSet.label_set.id
       );
-
-      if (found.length !== 0) {
-        return true;
-      } else {
-        return false;
-      }
+      return found.length !== 0;
     }
   },
 
@@ -533,18 +527,6 @@ const getters = {
     return document.proposed_split && document.proposed_split.length > 0;
   },
 
-  /**
-   * Joins all strings in a multi-entity Annotation array
-   * to look like a single string
-   */
-  getTextFromEntities: (state) => () => {
-    return state.selectedEntities
-      .map((entity) => {
-        return entity.content;
-      })
-      .join(" ");
-  },
-
   /**
    * Check the level of confidence of an annotation
    */
@@ -700,9 +682,6 @@ const actions = {
   setNewAcceptedAnnotations: ({ commit }, annotations) => {
     commit("SET_NEW_ACCEPTED_ANNOTATIONS", annotations);
   },
-  setSelectedEntities: ({ commit }, entities) => {
-    commit("SET_SELECTED_ENTITIES", entities);
-  },
   setSplittingSuggestions: ({ commit }, value) => {
     commit("SET_SPLITTING_SUGGESTIONS", value);
   },
@@ -1255,10 +1234,29 @@ const mutations = {
   SET_MISSING_ANNOTATIONS: (state, missingAnnotations) => {
     state.missingAnnotations = missingAnnotations;
   },
-  ADD_MISSING_ANNOTATIONS: (state, missingAnnotations) => {
-    missingAnnotations.map((annotation) => {
-      state.missingAnnotations.push(annotation);
-    });
+  ADD_MISSING_ANNOTATIONS: (state, annotations) => {
+    if (annotations && annotations.length > 0) {
+      annotations.map((annotation) => {
+        // check if already in missingAnnotations
+        const found = state.missingAnnotations.find(
+          (missingAnnotation) => missingAnnotation.id === annotation.id
+        );
+
+        if (found) {
+          const indexOfAnnotation = state.missingAnnotations.findIndex(
+            (missingAnnotation) => missingAnnotation.id === annotation.id
+          );
+
+          if (indexOfAnnotation > -1) {
+            state.missingAnnotations.splice(indexOfAnnotation, 1, annotation);
+          }
+        } else {
+          state.missingAnnotations.push(annotation);
+        }
+      });
+    } else {
+      state.missingAnnotations.push(annotations);
+    }
   },
   DELETE_MISSING_ANNOTATION: (state, id) => {
     const indexOfAnnotationToDelete = state.missingAnnotations.findIndex(
@@ -1299,9 +1297,6 @@ const mutations = {
   SET_NEW_ACCEPTED_ANNOTATIONS: (state, annotations) => {
     state.newAcceptedAnnotations = annotations;
   },
-  SET_SELECTED_ENTITIES: (state, entities) => {
-    state.selectedEntities = entities;
-  },
   SET_SERVER_ERROR: (state, value) => {
     state.serverError = value;
   },

package/src/store/edit.js

@@ -15,6 +15,7 @@ const state = {
   selectedPages: [],
   updatedDocument: [],
   showEditConfirmationModal: false,
+  documentBeingSplit: false,
 };
 
 const getters = {
@@ -45,6 +46,10 @@ const actions = {
     commit("SET_UPDATED_DOCUMENT", updatedDocument);
   },
 
+  setDocumentBeingSplit: ({ commit }, value) => {
+    commit("SET_DOCUMENT_BEING_SPLIT", value);
+  },
+
   selectPage: ({ state, commit }, page) => {
     if (state.isMultipleSelection) {
       commit("ADD_SELECTED_PAGE", page);
@@ -177,11 +182,13 @@ const actions = {
     commit("SET_PAGES_FOR_POSTPROCESS", array);
   },
 
-  editDocument: ({ rootState, dispatch }, editedDocument) => {
+  editDocument: ({ rootState, commit, dispatch }, editedDocument) => {
     dispatch("document/startRecalculatingAnnotations", null, {
       root: true,
     });
 
+    commit("SET_DOCUMENT_BEING_SPLIT", true);
+
     const oldId = rootState.document.documentId;
 
     return new Promise((resolve, reject) => {
@@ -194,6 +201,8 @@ const actions = {
             const newId = response.data[0].id;
             dispatch("document/setSplittingSuggestions", null, { root: true });
 
+            commit("SET_DOCUMENT_BEING_SPLIT", false);
+
             if (newId !== oldId) {
               if (getURLQueryParam("document") || getURLPath("docs")) {
                 navigateToNewDocumentURL(oldId, newId);
@@ -250,6 +259,9 @@ const mutations = {
   SET_SHOW_EDIT_CONFIRMATION_MODAL: (state, value) => {
     state.showEditConfirmationModal = value;
   },
+  SET_DOCUMENT_BEING_SPLIT: (state, value) => {
+    state.documentBeingSplit = value;
+  },
 };
 
 export default {

package/src/store/selection.js

@@ -14,6 +14,7 @@ const state = {
   isSelecting: false,
   spanSelection: null,
   elementSelected: null, // selected element id
+  selectedEntities: null,
 };
 
 const getters = {
@@ -37,9 +38,6 @@ const getters = {
     }
     return null;
   },
-  isValueArray: () => (value) => {
-    return Array.isArray(value);
-  },
 };
 
 const actions = {
@@ -70,7 +68,7 @@ const actions = {
       commit("MOVE_SELECTION", points);
     }
 
-    dispatch("document/setSelectedEntities", null, { root: true });
+    commit("SET_SELECTED_ENTITIES", null);
   },
 
   endSelection: ({ commit, state }, end) => {
@@ -99,9 +97,23 @@ const actions = {
     commit("SET_SPAN_SELECTION", span);
   },
 
-  getTextFromBboxes: ({ commit, rootState }, box) => {
+  setSelectedEntities: ({ commit }, entities) => {
+    commit("SET_SELECTED_ENTITIES", entities);
+  },
+
+  getTextFromBboxes: ({ commit, rootState }, { box, entities }) => {
+    let span;
+
+    if (entities) {
+      span = box.flatMap((s) => {
+        return s.original;
+      });
+    } else {
+      span = [box];
+    }
+
     return HTTP.post(`documents/${rootState.document.documentId}/bbox/`, {
-      span: [box],
+      span,
     })
       .then((response) => {
         if (response.data.span.length && response.data.span.length > 0) {
@@ -119,13 +131,23 @@ const actions = {
            * an annotation on this empty area, adding the offset_string
            * attribute, ready to be filled.
            */
-          commit("SET_SPAN_SELECTION", box);
+          commit("SET_SPAN_SELECTION", span);
         }
       })
       .catch((error) => {
         alert("Could not fetch the selected text from the backend");
       });
   },
+
+  getTextFromEntities: ({ commit, dispatch }, selectedEntities) => {
+    if (!selectedEntities) return;
+
+    return dispatch("getTextFromBboxes", {
+      box: selectedEntities,
+      entities: true,
+    });
+  },
+
   setSpanSelection: ({ commit }, span) => {
     commit("SET_SPAN_SELECTION", span);
   },
@@ -167,6 +189,9 @@ const mutations = {
   SET_SELECTION: (state, selection) => {
     state.selection = selection;
   },
+  SET_SELECTED_ENTITIES: (state, entities) => {
+    state.selectedEntities = entities;
+  },
 };
 
 export default {

package/src/utils/utils.js

@@ -29,3 +29,7 @@ export function navigateToNewDocumentURL(oldId, newId) {
   const newUrl = url.replace(oldId, newId);
   window.location.replace(newUrl);
 }
+
+export function isElementArray(element) {
+  return Array.isArray(element);
+}