@konfuzio/document-validation-ui 0.1.3-pre-release-3 → 0.1.4-pre-release-1

package/package.json

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

package/src/assets/scss/variables.scss

@@ -41,10 +41,7 @@ $text-color: #1a1a1a;
 
 :root {
   --primary-color: #{$konfuzio-green};
-
   --primary-button: 4px;
-  --secondary-button: 8px;
-  --tertiary-button: 20px;
 }
 
 $primary: var(--primary-color);
@@ -171,12 +168,8 @@ button {
     border-radius: var(--primary-button) !important;
   }
 
-  &.secondary-button {
-    border-radius: var(--secondary-button) !important;
-  }
-
   &.tertiary-button {
-    border-radius: var(--tertiary-button) !important;
+    border-radius: 20px !important;
   }
 }
 

package/src/components/App.vue

@@ -7,6 +7,7 @@
 <script>
 import DocumentDashboard from "./DocumentDashboard";
 import { DocumentsList } from "./DocumentsList";
+import { changeDocumentURL, getURLQueryParam } from "../utils/utils";
 import API from "../api";
 
 export default {
@@ -36,7 +37,9 @@ export default {
   },
   computed: {
     documentId() {
-      if (process.env.VUE_APP_DOCUMENT_ID) {
+      if (getURLQueryParam("document")) {
+        return getURLQueryParam("document");
+      } else if (process.env.VUE_APP_DOCUMENT_ID) {
         return process.env.VUE_APP_DOCUMENT_ID;
       } else if (this.document) {
         return this.document;

package/src/components/DocumentAnnotations/ActionButtons.vue

@@ -15,7 +15,7 @@
       :class="[
         'annotation-save-btn text-btn',
         actionBar && 'action-bar-save-btn',
-        actionBar ? 'tertiary-button' : 'secondary-button',
+        actionBar ? 'tertiary-button' : 'primary-button',
       ]"
       type="is-primary"
       @click.stop="save"
@@ -48,7 +48,7 @@
     <!-- accept button -->
     <b-button
       v-if="acceptBtn && !isLoading && !saveBtn && !cancelBtn && !publicView"
-      class="annotation-accept-btn secondary-button"
+      class="annotation-accept-btn primary-button"
       type="is-primary"
       @click.stop="accept"
     >

package/src/components/DocumentAnnotations/EmptyAnnotation.vue

@@ -114,17 +114,17 @@ export default {
       }
     },
     spanSelection(newValue) {
-      if (!newValue) return;
-
-      const isSpanArray = Array.isArray(newValue);
+      if (this.elementSelected === this.emptyAnnotationId() && newValue) {
+        const isSpanArray = Array.isArray(newValue);
 
-      // Check if the bbox is empty
-      if (
-        (isSpanArray && !newValue[0].offset_string) ||
-        (!isSpanArray && !newValue.offset_string)
-      ) {
-        this.$store.dispatch("document/resetEditAnnotation");
-        this.$store.dispatch("selection/disableSelection");
+        // Check if the bbox is empty
+        if (
+          (isSpanArray && !newValue[0].offset_string) ||
+          (!isSpanArray && !newValue.offset_string)
+        ) {
+          this.$store.dispatch("document/resetEditAnnotation");
+          this.$store.dispatch("selection/disableSelection");
+        }
       }
     },
   },

package/src/store/document.js

@@ -1,5 +1,5 @@
 import myImports from "../api";
-import sleep from "../utils/utils";
+import { sleep } from "../utils/utils";
 
 const HTTP = myImports.HTTP;
 const documentPollDuration = 1000;
@@ -923,11 +923,11 @@ const actions = {
     }
 
     // check type of error
-    if (error.data && error.data.length > 0) {
-      dispatch("setErrorMessage", error.data[0]);
-    } else if (errorAsString.startsWith("5")) {
+    if (error && error.status === 500) {
       dispatch("setErrorMessage", serverErrorMessage);
       commit("SET_SERVER_ERROR", true);
+    } else if (error.data && error.data.length > 0) {
+      dispatch("setErrorMessage", error.data[0]);
     } else {
       dispatch("setErrorMessage", defaultErrorMessage);
     }

package/src/store/selection.js

@@ -143,7 +143,6 @@ const mutations = {
     state.selection.start = start;
   },
   MOVE_SELECTION: (state, points) => {
-    state.isSelecting = true;
     const { start, end } = points;
     if (start) {
       state.selection.start = start;

package/src/utils/utils.js

@@ -1,3 +1,18 @@
-export default function sleep(duration) {
-  new Promise(resolve => setTimeout(resolve, duration));
-}
+export function sleep(duration) {
+  new Promise((resolve) => setTimeout(resolve, duration));
+}
+
+export function getURLQueryParam(param) {
+  const queryString = window.location.search;
+  const urlParams = new URLSearchParams(queryString);
+  if (urlParams.has(param)) {
+    return urlParams.get(param);
+  }
+  return undefined;
+}
+
+export function navigateToNewDocumentURL(oldId, newId) {
+  const url = window.location.href;
+  const newUrl = url.replace(oldId, newId);
+  window.location.replace(newUrl);
+}