@konfuzio/document-validation-ui 0.1.42-dev.0 → 0.1.42

package/src/components/DocumentPage/EditAnnotation.vue

@@ -125,7 +125,6 @@ const margin = 12;
 const widthOfPopup = 205;
 
 import { mapGetters, mapState } from "vuex";
-import { MULTI_ANN_TABLE_FEATURE } from "../../constants";
 
 export default {
   props: {
@@ -334,7 +333,6 @@ export default {
     openAnnotationSetCreation() {
       this.$store.dispatch("display/showChooseLabelSetModal", {
         show: true,
-        isMultipleAnnotations: MULTI_ANN_TABLE_FEATURE,
         finish: this.chooseLabelSet,
       });
     },

package/src/components/DocumentPage/NewAnnotation.vue

@@ -11,6 +11,7 @@
       :class="[
         'annotation-dropdown',
         'no-padding-bottom',
+        'no-padding-top',
         setsList.length === 0 ? 'no-padding-top' : '',
       ]"
       scrollable
@@ -25,7 +26,9 @@
               ? `${selectedSet.label_set.name} ${
                   selectedSet.id
                     ? numberOfAnnotationSetGroup(selectedSet)
-                    : `(${$t("new")})`
+                    : `${numberOfLabelSetGroup(selectedSet.label_set)} (${$t(
+                        "new"
+                      )})`
                 }`
               : $t("select_annotation_set")
           }}
@@ -34,6 +37,14 @@
           </span>
         </b-button>
       </template>
+      <b-button
+        type="is-ghost"
+        :class="['add-ann-set', 'dropdown-item', 'no-icon-margin']"
+        icon-left="plus"
+        @click="openAnnotationSetCreation"
+      >
+        {{ $t("new_ann_set_title") }}
+      </b-button>
       <b-dropdown-item
         v-for="(set, index) in setsList"
         :key="`${set.label_set.id}_${index}`"
@@ -42,23 +53,12 @@
       >
         <span>{{
           `${set.label_set.name} ${
-            set.id ? numberOfAnnotationSetGroup(set) : `(${$t("new")})`
+            set.id
+              ? numberOfAnnotationSetGroup(set)
+              : `${numberOfLabelSetGroup(set.label_set)} (${$t("new")})`
           }`
         }}</span>
       </b-dropdown-item>
-      <b-button
-        type="is-ghost"
-        :class="[
-          'add-ann-set',
-          'dropdown-item',
-          'no-icon-margin',
-          setsList.length > 0 ? 'has-border' : '',
-        ]"
-        icon-left="plus"
-        @click="openAnnotationSetCreation"
-      >
-        {{ $t("new_ann_set_title") }}
-      </b-button>
     </b-dropdown>
     <b-tooltip
       multilined
@@ -133,7 +133,6 @@ const margin = 12;
 const widthOfPopup = 205;
 
 import { mapGetters, mapState } from "vuex";
-import { MULTI_ANN_TABLE_FEATURE } from "../../constants";
 
 export default {
   props: {
@@ -168,6 +167,7 @@ export default {
     ...mapState("document", ["annotationSets", "documentId"]),
     ...mapGetters("document", [
       "numberOfAnnotationSetGroup",
+      "numberOfLabelSetGroup",
       "labelsFilteredForAnnotationCreation",
       "isNegative",
     ]),
@@ -231,6 +231,9 @@ export default {
     selectedSet(newValue) {
       this.selectedLabel = null;
       this.labels = this.labelsFilteredForAnnotationCreation(newValue);
+      if (this.labels.length === 1) {
+        this.selectedLabel = this.labels[0];
+      }
     },
   },
   mounted() {
@@ -337,7 +340,6 @@ export default {
     openAnnotationSetCreation() {
       this.$store.dispatch("display/showChooseLabelSetModal", {
         show: true,
-        isMultipleAnnotations: MULTI_ANN_TABLE_FEATURE,
         finish: this.chooseLabelSet,
       });
     },

package/src/constants.js

@@ -9,4 +9,3 @@ export const TEXT_BREAKPOINT_WIDTH = (locale) => {
     return 1800;
   }
 };
-export const MULTI_ANN_TABLE_FEATURE = false;

package/src/store/document.js

@@ -1,5 +1,4 @@
 import myImports from "../api";
-import { MULTI_ANN_TABLE_FEATURE } from "../constants";
 import {
   sleep,
   getURLQueryParam,
@@ -181,41 +180,38 @@ const getters = {
   /* Get annotation sets created in table */
   annotationSetsInTable: (state) => () => {
     const annotationSetsList = {};
-    if (MULTI_ANN_TABLE_FEATURE) {
-      state.annotationSets.forEach((annotationSet) => {
-        let addAnnotationSet = false;
-        if (annotationSet.labels) {
-          annotationSet.labels.forEach((label) => {
-            if (
-              label.annotations &&
-              label.annotations.find(
-                (annotation) =>
-                  annotation.origin && annotation.origin === table_reference_api
-              )
-            ) {
-              addAnnotationSet = true;
-              return;
-            }
-          });
-        }
-        if (addAnnotationSet) {
-          // group by label set
-          if (annotationSetsList[`${annotationSet.label_set.id}`]) {
-            annotationSetsList[`${annotationSet.label_set.id}`].push(
-              annotationSet
-            );
-          } else {
-            annotationSetsList[`${annotationSet.label_set.id}`] = [
-              annotationSet,
-            ];
+    state.annotationSets.forEach((annotationSet) => {
+      let addAnnotationSet = false;
+      if (annotationSet.labels) {
+        annotationSet.labels.forEach((label) => {
+          if (
+            label.annotations &&
+            label.annotations.find(
+              (annotation) =>
+                annotation.origin && annotation.origin === table_reference_api
+            )
+          ) {
+            addAnnotationSet = true;
+            return;
           }
+        });
+      }
+      if (addAnnotationSet) {
+        // group by label set
+        if (annotationSetsList[`${annotationSet.label_set.id}`]) {
+          annotationSetsList[`${annotationSet.label_set.id}`].push(
+            annotationSet
+          );
+        } else {
+          annotationSetsList[`${annotationSet.label_set.id}`] = [annotationSet];
         }
-      });
-    }
+      }
+    });
+
     return annotationSetsList;
   },
 
-  /* Get annotation sets without tables */
+  /* Get annotation sets */
   annotationSetsToShowInList: (state) => () => {
     const annotationSetsList = [];
     state.annotationSets.forEach((annotationSet) => {
@@ -223,7 +219,6 @@ const getters = {
       if (annotationSet.labels) {
         annotationSet.labels.forEach((label) => {
           if (
-            MULTI_ANN_TABLE_FEATURE &&
             label.annotations &&
             label.annotations.find(
               (annotation) =>
@@ -442,17 +437,19 @@ const getters = {
     let processedLabels = [];
 
     annotationSets.forEach((annotationSet) => {
-      labels = [];
-      annotationSet.labels.forEach((label) => {
-        const labelAnnotations = [];
+      if (annotationSet.id) {
+        labels = [];
+        annotationSet.labels.forEach((label) => {
+          const labelAnnotations = [];
 
-        // add annotations to the document array
-        labelAnnotations.push(...label.annotations);
-        labels.push({ ...label, annotations: labelAnnotations });
-        processedLabels.push(label);
-        annotations.push(...labelAnnotations);
-      });
-      processedAnnotationSets.push({ ...annotationSet, labels });
+          // add annotations to the document array
+          labelAnnotations.push(...label.annotations);
+          labels.push({ ...label, annotations: labelAnnotations });
+          processedLabels.push(label);
+          annotations.push(...labelAnnotations);
+        });
+        processedAnnotationSets.push({ ...annotationSet, labels });
+      }
     });
     return {
       annotationSets: processedAnnotationSets,
@@ -489,7 +486,11 @@ const getters = {
     let value = 0;
     let index = 0;
     if (state.annotationSets) {
-      state.annotationSets.map((annotationSetTemp) => {
+      let orderedAnnotationSets = [...state.annotationSets];
+      orderedAnnotationSets.sort((a, b) => {
+        return a.id - b.id || a.label_set.name.localeCompare(b.label_set.name);
+      });
+      orderedAnnotationSets.map((annotationSetTemp) => {
         if (
           annotationSetTemp.id !== annotationSet.id &&
           annotationSetTemp.label_set.id === annotationSet.label_set.id &&
@@ -508,6 +509,31 @@ const getters = {
     return "";
   },
 
+  /**
+   * Checks if theres a group of annotation sets with this label set
+   */
+  numberOfLabelSetGroup: (state) => (labelSet) => {
+    let found = false;
+    let index = 0;
+    if (state.annotationSets) {
+      let orderedAnnotationSets = [...state.annotationSets];
+      orderedAnnotationSets.sort((a, b) => {
+        return a.id - b.id || a.label_set.name.localeCompare(b.label_set.name);
+      });
+      orderedAnnotationSets.map((annotationSetTemp) => {
+        if (
+          annotationSetTemp.label_set.id === labelSet.id &&
+          annotationSetTemp.label_set.name === labelSet.name
+        ) {
+          found = true;
+          index++;
+        }
+      });
+      return found ? `${index + 1}` : "";
+    }
+    return "";
+  },
+
   /**
    * Get label with annotations filtered if the label supports multiple or not
    */