@konfuzio/document-validation-ui 0.1.44 → 0.1.45

package/src/store/document.js

@@ -20,6 +20,7 @@ const state = {
   annotations: null,
   labels: [],
   documentId: process.env.VUE_APP_DOCUMENT,
+  documentSet: null,
   annotationId: null,
   annotationSetId: null,
   documentAnnotationSelected: null,
@@ -127,7 +128,7 @@ const getters = {
   labelsFilteredForAnnotationCreation: (_, getters) => (set) => {
     let availableLabels = [];
     if (set.id && set.labels) {
-      // check if label can be multiple, if there's already an annotation created & if it's a negative annotation
+      // check if label can be multiple, if there's already an annotation created
       set.labels.map((label) => {
         // check if we already added the same label to the array
         const found = availableLabels.find((l) => l.id === label.id);
@@ -136,17 +137,8 @@ const getters = {
 
         if (label.annotations.length === 0) {
           availableLabels.push(label);
-        } else {
-          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 (label.has_multiple_top_candidates) {
+          availableLabels.push(label);
         }
       });
     } else if (set.labels) {
@@ -432,7 +424,7 @@ const getters = {
   },
 
   /* Process annotations and extract labels and sets */
-  processAnnotationSets: () => (annotationSets) => {
+  processAnnotationSets: (_, getters) => (annotationSets) => {
     // group annotations for sidebar
     let annotations = [];
     let labels = [];
@@ -445,7 +437,12 @@ const getters = {
         const labelAnnotations = [];
 
         // add annotations to the document array
-        labelAnnotations.push(...label.annotations);
+        // remove negative annotations
+        label.annotations.forEach((ann) => {
+          if (!getters.isNegative(ann)) {
+            labelAnnotations.push(ann);
+          }
+        });
         labels.push({ ...label, annotations: labelAnnotations });
         processedLabels.push(label);
         annotations.push(...labelAnnotations);
@@ -510,6 +507,22 @@ const getters = {
     return "";
   },
 
+  /**
+   * Checks the number of current document in the document set
+   */
+  numberOfDocumentInSet: (state) => (documentId) => {
+    let index = -1;
+    if (state.documentSet && state.documentSet.documents) {
+      state.documentSet.documents.forEach((docTemp, indexTemp) => {
+        if (docTemp.id == documentId) {
+          index = indexTemp;
+          return;
+        }
+      });
+    }
+    return index === -1 ? "" : `${index + 1}`;
+  },
+
   /**
    * Checks if theres a group of annotation sets with this label set
    */
@@ -638,11 +651,7 @@ const getters = {
           annotationSet.label_set.id === l.label_set
       );
 
-      const foundNegative = label.annotations.find((annotation) =>
-        getters.isNegative(annotation)
-      );
-
-      if (!foundMissing && (label.annotations.length === 0 || foundNegative)) {
+      if (!foundMissing && label.annotations.length === 0) {
         pendingEmpty.push(label);
       }
     });
@@ -726,7 +735,7 @@ const getters = {
 
     // if all annotations are correct
     // and if there are no empty annotations or
-    // all empty annotations or negative annotations were marked as missing,
+    // all empty annotations were marked as missing,
     // we can finish the review
     if (
       !emptyAnnotations ||
@@ -1026,9 +1035,10 @@ const actions = {
    */
   fetchDocument: async (
     { commit, state, dispatch, rootState, getters },
-    pollDocumentList = false
+    fetchedDocument = null
   ) => {
     let projectId = null;
+    let documentSetId = null;
     let categoryId = null;
     let isRecalculatingAnnotations = false;
 
@@ -1038,56 +1048,56 @@ const actions = {
     dispatch("display/updateCurrentPage", initialPage, {
       root: true,
     });
+    try {
+      if (!fetchedDocument) {
+        const response = await HTTP.get(`documents/${state.documentId}/`);
+        fetchedDocument = response.data;
+      }
 
-    await HTTP.get(`documents/${state.documentId}/`)
-      .then(async (response) => {
-        if (response.data) {
-          const { labels, annotations, annotationSets } =
-            getters.processAnnotationSets(response.data.annotation_sets);
+      const { labels, annotations, annotationSets } =
+        getters.processAnnotationSets(fetchedDocument.annotation_sets);
 
-          // load first page
-          if (response.data.pages.length > 0) {
-            dispatch("fetchDocumentPage", initialPage);
-          }
+      // load first page
+      if (fetchedDocument.pages.length > 0) {
+        dispatch("fetchDocumentPage", initialPage);
+      }
 
-          // set information on the store
-          commit("SET_ANNOTATION_SETS", annotationSets);
-          commit("SET_ANNOTATIONS", annotations);
-          commit("SET_LABELS", labels);
-          commit("SET_SELECTED_DOCUMENT", response.data);
+      // set information on the store
+      commit("SET_ANNOTATION_SETS", annotationSets);
+      commit("SET_ANNOTATIONS", annotations);
+      commit("SET_LABELS", labels);
+      commit("SET_SELECTED_DOCUMENT", fetchedDocument);
 
-          if (response.data.project) {
-            projectId = response.data.project;
+      if (fetchedDocument.project) {
+        projectId = fetchedDocument.project;
 
-            dispatch("project/setProjectId", projectId, {
-              root: true,
-            });
+        dispatch("project/setProjectId", projectId, {
+          root: true,
+        });
 
-            dispatch(
-              "project/setShowAnnotationTranslations",
-              response.data.enable_translated_strings,
-              {
-                root: true,
-              }
-            );
+        dispatch(
+          "project/setShowAnnotationTranslations",
+          fetchedDocument.enable_translated_strings,
+          {
+            root: true,
           }
+        );
+      }
 
-          if (getters.documentHasProposedSplit(response.data)) {
-            commit("SET_SPLITTING_SUGGESTIONS", response.data.proposed_split);
-          }
+      if (getters.documentHasProposedSplit(fetchedDocument)) {
+        commit("SET_SPLITTING_SUGGESTIONS", fetchedDocument.proposed_split);
+      }
 
-          categoryId = response.data.category;
-          // TODO: add this validation to a method
-          isRecalculatingAnnotations = response.data.labeling_available !== 1;
-        }
-      })
-      .catch((error) => {
-        console.log(error, "Could not fetch document details from the backend");
-        dispatch("display/setPageError", error.response.data.detail, {
-          root: true,
-        });
-        return;
+      documentSetId = fetchedDocument.document_set;
+      categoryId = fetchedDocument.category;
+      isRecalculatingAnnotations = fetchedDocument.labeling_available !== 1;
+    } catch (error) {
+      console.log(error, "Could not fetch document details from the backend");
+      dispatch("display/setPageError", error.response.data.detail, {
+        root: true,
       });
+      return;
+    }
 
     if (!state.publicView) {
       await dispatch("fetchMissingAnnotations");
@@ -1109,6 +1119,10 @@ const actions = {
         dispatch("edit/setRenameAndCategorize", true, { root: true });
       }
 
+      if (documentSetId) {
+        await dispatch("fetchDocumentSet", documentSetId);
+      }
+
       if (projectId) {
         await dispatch("category/fetchCategories", projectId, {
           root: true,
@@ -1125,7 +1139,7 @@ const actions = {
           {
             categoryId,
             user: rootState.project.currentUser.username,
-            poll: pollDocumentList,
+            poll: false,
           },
           {
             root: true,
@@ -1151,6 +1165,22 @@ const actions = {
       });
   },
 
+  // Set document set data
+  setDocumentSet: ({ commit }, documentSet) => {
+    commit("SET_DOC_SET", documentSet);
+  },
+
+  // Get document set data
+  fetchDocumentSet: ({ commit, state }, documentSetId) => {
+    return HTTP.get(`document-sets/${documentSetId}/`)
+      .then((response) => {
+        commit("SET_DOC_SET", response.data);
+      })
+      .catch((error) => {
+        console.log(error);
+      });
+  },
+
   setDocumentAnnotationSelected: (
     { commit },
     { annotation, label, span, scrollTo = false }
@@ -1173,10 +1203,7 @@ const actions = {
     commit("SET_DOCUMENT_ANNOTATION_SELECTED", null);
   },
 
-  createAnnotation: (
-    { commit, getters, dispatch },
-    { annotation, negativeAnnotationId }
-  ) => {
+  createAnnotation: ({ commit, getters, dispatch }, { annotation }) => {
     return new Promise((resolve, reject) => {
       HTTP.post(`/annotations/`, annotation)
         .then(async (response) => {
@@ -1197,9 +1224,6 @@ const actions = {
               if (response.data && response.data.id) {
                 dispatch("setAnnotationId", response.data.id);
               }
-              if (negativeAnnotationId) {
-                commit("DELETE_ANNOTATION", negativeAnnotationId);
-              }
             }
 
             resolve(response);
@@ -1309,9 +1333,13 @@ const actions = {
 
   fetchMissingAnnotations: ({ commit, state, getters }) => {
     return new Promise((resolve, reject) => {
-      return HTTP.get(`/missing-annotations/?document=${state.documentId}`)
-        .then((response) => {
-          commit("SET_MISSING_ANNOTATIONS", response.data.results);
+      return myImports
+        .makeGetPaginatedRequest(
+          `/missing-annotations/?document=${state.documentId}`,
+          true
+        )
+        .then((results) => {
+          commit("SET_MISSING_ANNOTATIONS", results);
           resolve(true);
         })
         .catch((error) => {
@@ -1471,17 +1499,33 @@ const actions = {
     window.open(fullUrl, "_blank");
   },
 
-  changeCurrentDocument: ({ commit, state, dispatch }, newDocumentId) => {
+  changeCurrentDocument: (
+    { commit, state, dispatch, rootState },
+    { document, documentId }
+  ) => {
     // reset splitting suggestions
     if (state.splittingSuggestions) {
       commit("SET_SPLITTING_SUGGESTIONS", null);
     }
+
+    if (rootState.edit.editMode) {
+      // Reset edit mode when changing the document,
+      // in case the change was made from the arrows in the Edit Mode
+      // so that the user does not get stuck in this interface
+      dispatch("edit/disableEditMode", null, {
+        root: true,
+      });
+    }
+
     commit("SET_RECALCULATING_ANNOTATIONS", false);
 
     if (getURLQueryParam("document") || getURLPath("d")) {
-      navigateToNewDocumentURL(state.selectedDocument.id, newDocumentId);
+      navigateToNewDocumentURL(state.selectedDocument.id, documentId);
+    } else if (document) {
+      commit("SET_DOC_ID", document.id);
+      dispatch("fetchDocument", document);
     } else {
-      commit("SET_DOC_ID", newDocumentId);
+      commit("SET_DOC_ID", documentId);
       dispatch("fetchDocument");
     }
   },
@@ -1496,6 +1540,20 @@ const mutations = {
       state.documentId = id;
     }
   },
+  SET_DOC_SET: (state, documentSet) => {
+    // assuming that documents in document set are ordered from new to old
+    let documents = [];
+    if (documentSet && documentSet.documents) {
+      documents = documentSet.documents.slice().reverse();
+    }
+
+    const orderedDocumentSet = {
+      ...documentSet,
+      documents,
+    };
+
+    state.documentSet = orderedDocumentSet;
+  },
   SET_ANNOTATION_ID: (state, id) => {
     state.annotationId = id;
   },

package/src/store/project.js

@@ -30,9 +30,10 @@ const actions = {
 
   // Get label sets from the project
   fetchLabelSets: ({ commit, state }) => {
-    return HTTP.get(`label-sets/?project=${state.projectId}`)
-      .then((response) => {
-        commit("SET_LABEL_SETS", response.data.results);
+    return myImports
+      .makeGetPaginatedRequest(`label-sets/?project=${state.projectId}`, true)
+      .then((results) => {
+        commit("SET_LABEL_SETS", results);
       })
       .catch((error) => {
         console.log(error);
@@ -66,12 +67,14 @@ const actions = {
   },
 
   fetchDocumentList: ({ commit, state }, parameters) => {
-    return HTTP.get(
-      `documents/?project=${state.projectId}&limit=100&${parameters}`
-    )
-      .then((response) => {
-        if (response.data.results) {
-          commit("SET_DOCUMENTS_IN_PROJECT", response.data.results);
+    return myImports
+      .makeGetPaginatedRequest(
+        `documents/?project=${state.projectId}&${parameters}`,
+        true
+      )
+      .then((results) => {
+        if (results) {
+          commit("SET_DOCUMENTS_IN_PROJECT", results);
         }
       })
       .catch((error) => {