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

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);
+}