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

package/package.json

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

package/src/components/DocumentAnnotations/AnnotationContent.vue

@@ -85,22 +85,10 @@ export default {
   },
 
   watch: {
-    editAnnotation(newAnnotation, oldAnnotation) {
+    isAnnotationBeingEdited(newState, oldState) {
       // verify if new annotation in edit mode is not this one and if this
       // one was selected before so we set the state to the previous one (like a cancel)
-
-      if (
-        !newAnnotation &&
-        oldAnnotation &&
-        oldAnnotation.id === this.annotation.id
-      ) {
-        this.handleCancel(true);
-      } else if (
-        newAnnotation &&
-        oldAnnotation &&
-        newAnnotation.id === this.annotation.id &&
-        newAnnotation.id !== oldAnnotation.id
-      ) {
+      if (!newState && oldState) {
         this.handleCancel();
       }
     },
@@ -171,14 +159,8 @@ export default {
         }
       }
     },
-    handleCancel(wasOutsideClick = false) {
-      if (wasOutsideClick) {
-        this.setText(this.span.offset_string);
-      } else {
-        this.$store.dispatch("selection/disableSelection");
-        this.$store.dispatch("document/endLoading");
-      }
-
+    handleCancel() {
+      this.setText(this.span.offset_string);
       this.isLoading = false;
       if (this.$refs.contentEditable) {
         this.$refs.contentEditable.blur();

package/src/components/DocumentAnnotations/AnnotationRow.vue

@@ -227,19 +227,33 @@ export default {
   },
   watch: {
     sidebarAnnotationSelected(newSidebarAnnotationSelected) {
-      if (
-        newSidebarAnnotationSelected &&
-        this.annotation &&
-        this.annotation.id === newSidebarAnnotationSelected.annotation.id
-      ) {
+      if (!newSidebarAnnotationSelected) return;
+
+      let annotationSelected;
+
+      if (newSidebarAnnotationSelected.annotation) {
+        annotationSelected = newSidebarAnnotationSelected.annotation;
+      } else {
+        annotationSelected = newSidebarAnnotationSelected;
+      }
+
+      if (this.annotation && this.annotation.id === annotationSelected.id) {
         clearTimeout(this.annotationAnimationTimeout);
 
+        let timeout;
+
+        if (!newSidebarAnnotationSelected.trigger) {
+          timeout = 600;
+        } else {
+          timeout = 1200;
+        }
+
         this.isSelected = true;
         // remove annotation selection after some time
         this.annotationAnimationTimeout = setTimeout(() => {
           this.$store.dispatch("document/setSidebarAnnotationSelected", null);
           this.isSelected = false;
-        }, 1500);
+        }, timeout);
 
         // Check if sidebarAnnotationSelected changed from a click or hover
         if (newSidebarAnnotationSelected.trigger === "click") {

package/src/components/DocumentAnnotations/DocumentLabel.vue

@@ -109,9 +109,18 @@ export default {
         !this.showAnnotationsGroup &&
         newSidebarAnnotationSelected
       ) {
+        let annotationSelected;
+
+        if (newSidebarAnnotationSelected.annotation) {
+          annotationSelected = newSidebarAnnotationSelected.annotation;
+        } else {
+          annotationSelected = newSidebarAnnotationSelected;
+        }
+
         const annotation = this.label.annotations.find(
-          (ann) => ann.id === newSidebarAnnotationSelected.id
+          (ann) => ann.id === annotationSelected.id
         );
+
         if (annotation) {
           this.showAnnotationsGroup = true;
           this.$store.dispatch("document/setSidebarAnnotationSelected", null);

package/src/components/DocumentCategory.vue

@@ -104,6 +104,33 @@ export default {
       if (!this.splitMode) {
         return this.categoryName(this.selectedDocument.category);
       } else {
+        const missingCategory = this.updatedDocument.find(
+          (item) => !item.category
+        );
+
+        // if there is just 1 category in the project,
+        // and one or more sub-documents has no category,
+        // assign the only category by default
+        if (this.projectHasSingleCategory() && missingCategory) {
+          const updatedValuesForDocuments = this.updatedDocument.map(
+            (document) => {
+              if (!document.category && this.categories) {
+                document.category = this.categories[0].id;
+              }
+
+              return document;
+            }
+          );
+
+          // update the store state
+          // so that if the changes are saved the data sent to the API is updated
+          // instead of only handling the category name in this component
+          this.$store.dispatch(
+            "edit/setUpdatedDocument",
+            updatedValuesForDocuments
+          );
+        }
+
         const categoryName = this.categoryName(
           this.updatedDocument[this.index].category
         );

package/src/components/DocumentModals/DocumentErrorModal.vue

@@ -1,14 +1,16 @@
 <template>
   <section class="document-error-modal">
-    <b-modal v-model="isModalActive" :width="400">
+    <b-modal
+      v-model="isModalActive"
+      :width="400"
+      can-cancel="['x']"
+      :on-cancel="closeModal"
+    >
       <section class="modal-card-body">
         <div class="header">
           <div class="error-icon">
             <ErrorIcon class="icon" />
           </div>
-          <div class="btn-container" type="button" @click="closeModal">
-            <b-icon icon="xmark" class="close-btn" size="is-small" />
-          </div>
         </div>
         <div class="content">
           <h3>{{ $t("document_error_title") }}</h3>