@konfuzio/document-validation-ui 0.1.10-dev.15 → 0.1.10-dev.16

package/package.json

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

package/src/assets/scss/document_edit.scss

@@ -46,6 +46,8 @@
           display: flex;
           flex-direction: row;
           justify-content: space-between;
+          height: 100%;
+          align-items: center;
         }
         .bottom-section {
           text-align: center;

package/src/assets/scss/document_name.scss

@@ -1,11 +1,9 @@
 @import "./imports.scss";
 
 .document-name-component {
-  flex: 1;
   display: flex;
   align-items: center;
   justify-content: center;
-  width: 100%;
   gap: 12px;
   line-height: 20px;
 

package/src/assets/scss/document_top_bar.scss

@@ -37,6 +37,12 @@
       align-items: center;
       gap: 38px;
 
+      &.single-component {
+        flex: 1;
+        align-items: center;
+        justify-content: center;
+      }
+
       .navigation-arrow {
         &:hover {
           cursor: pointer;

package/src/assets/scss/theme.scss

@@ -291,7 +291,7 @@
   }
 
   .b-checkbox.checkbox {
-    .check {
+    input[type="checkbox"] + .check {
       background-color: $white;
     }
     &:hover input[type="checkbox"]:not(:disabled) + .check {

package/src/components/App.vue

@@ -66,6 +66,7 @@ export default {
       required: false,
       default: "",
     },
+    // eslint-disable-next-line vue/require-default-prop
     locale: {
       type: String,
       required: false,
@@ -110,11 +111,7 @@ export default {
       }
     },
     isPublicView() {
-      if (
-        process.env.VUE_APP_GUEST_USER_TOKEN ||
-        this.user_token ||
-        (this.full_mode && this.full_mode === "true")
-      ) {
+      if (this.userToken || (this.full_mode && this.full_mode === "true")) {
         return false;
       } else {
         return true;

package/src/components/DocumentAnnotations/AnnotationContent.vue

@@ -66,7 +66,6 @@ export default {
       "isDocumentReviewed",
     ]),
     ...mapGetters("display", ["bboxToRect"]),
-    ...mapState("selection", ["spanSelection"]),
     ...mapState("document", [
       "editAnnotation",
       "publicView",

package/src/components/DocumentEdit/DocumentEdit.vue

@@ -85,8 +85,9 @@ export default {
       "selectedPages",
       "submitEditChanges",
     ]),
-    ...mapState("project", ["projectId", "documentsListPath"]),
+    ...mapState("project", ["projectId", "documentsListPath", "currentUser"]),
     ...mapGetters("edit", ["documentShouldBePostprocessed"]),
+    ...mapGetters("document", ["waitingForSplittingConfirmation"]),
   },
   watch: {
     renameAndCategorize(newValue) {
@@ -375,7 +376,10 @@ export default {
     // Send update request to the backend
     saveEditChanges() {
       // Verify if there was splitting, rotating and/or reordering
-      if (this.documentShouldBePostprocessed) {
+      if (
+        this.documentShouldBePostprocessed ||
+        this.waitingForSplittingConfirmation(this.selectedDocument)
+      ) {
         this.$store
           .dispatch("edit/editDocument", this.updatedDocument)
           .catch((error) => {
@@ -386,9 +390,13 @@ export default {
             });
           });
 
-        navigateToDocumentsList(this.documentsListPath, this.projectId);
+        navigateToDocumentsList(
+          this.documentsListPath,
+          this.projectId,
+          this.currentUser.id
+        );
       } else {
-        // Check if only the category changes:
+        // Check if only the category and/or name changes:
         const newCategory = this.updatedDocument[0].category;
         const newName = this.updatedDocument[0].name;
         let category = {};

package/src/components/DocumentEdit/EditPageThumbnail.vue

@@ -11,9 +11,7 @@
         isVisible && 'visible',
         checkboxValue && 'selected',
       ]"
-      :style="{
-        transform: `rotate(${rotation}deg)`,
-      }"
+      :style="`rotate:${rotation}deg`"
       @click="selectPage()"
     >
       <ServerImage :image-url="`${page.thumbnail_url}?${page.updated_at}`">

package/src/components/DocumentEdit/EditSidebar.vue

@@ -96,7 +96,7 @@ export default {
     };
   },
   computed: {
-    ...mapState("edit", ["selectedPages"]),
+    ...mapState("edit", ["selectedPages", "updatedDocument"]),
     ...mapState("document", ["splittingSuggestions", "selectedDocument"]),
     ...mapGetters("document", ["documentHasProposedSplit"]),
   },
@@ -117,6 +117,11 @@ export default {
         this.switchStatus = false;
       }
     },
+    updatedDocument(newValue) {
+      if (newValue && newValue.length === 1) {
+        this.switchStatus = false;
+      }
+    },
   },
   mounted() {
     this.$nextTick(() => {

package/src/components/DocumentPage/DocumentToolbar.vue

@@ -119,6 +119,7 @@ export default {
   methods: {
     handleEdit() {
       if (this.editModeDisabled) return;
+      this.$store.dispatch("selection/disableSelection");
       this.$store.dispatch("edit/enableEditMode");
     },
     zoomIn() {

package/src/components/DocumentTopBar/DocumentName.vue

@@ -1,5 +1,7 @@
 <template>
-  <div class="document-name-component">
+  <div
+    :class="['document-name-component', editMode && 'document-name-edit-mode']"
+  >
     <div class="document-icon">
       <ServerImage
         :height="'22px'"

package/src/components/DocumentTopBar/DocumentTopBar.vue

@@ -10,7 +10,12 @@
         />
       </div>
 
-      <div class="center-bar-components">
+      <div
+        :class="[
+          'center-bar-components',
+          recalculatingAnnotations && 'single-component',
+        ]"
+      >
         <div
           :class="[
             'left-arrow navigation-arrow',

package/src/store/document.js

@@ -774,7 +774,7 @@ const actions = {
           "category/createAvailableDocumentsList",
           {
             categoryId,
-            user: rootState.project.currentUser,
+            user: rootState.project.currentUser.username,
             poll: pollDocumentList,
           },
           {
@@ -1093,7 +1093,7 @@ const actions = {
 
   contactSupport: ({ rootState }, error) => {
     const url = "https://konfuzio.com/support/";
-    const params = `project=${rootState.project.projectId}&email=${rootState.project.currentUser}&issue=${error}`;
+    const params = `project=${rootState.project.projectId}&email=${rootState.project.currentUser.username}&issue=${error}`;
     const fullUrl = `${url}?${params}`;
 
     window.open(fullUrl, "_blank");

package/src/store/edit.js

@@ -28,12 +28,19 @@ const getters = {
       (page) => page.angle !== 0
     );
 
-    let foundReorderedPage;
-
-    state.pagesForPostprocess.map((page) => {
-      foundReorderedPage = rootState.document.selectedDocument.pages.find(
-        (p) => p.id === page.id && p.number !== page.number
-      );
+    let foundReorderedPage = false;
+
+    state.pagesForPostprocess.map((page, index) => {
+      if (
+        (page.id === rootState.document.selectedDocument.pages[index].id &&
+          page.number !==
+            rootState.document.selectedDocument.pages[index].number) ||
+        (page.id !== rootState.document.selectedDocument.pages[index].id &&
+          page.number ===
+            rootState.document.selectedDocument.pages[index].number)
+      ) {
+        foundReorderedPage = true;
+      }
     });
 
     return (
@@ -219,7 +226,7 @@ const actions = {
 
             commit("SET_SUBMIT_EDIT_CHANGES", false);
 
-            if (newId !== oldId) {
+            if (newId != oldId) {
               if (getURLQueryParam("document") || getURLPath("docs")) {
                 navigateToNewDocumentURL(oldId, newId);
               } else {
@@ -231,12 +238,17 @@ const actions = {
                   root: true,
                 });
               }
+            } else {
+              dispatch("document/setSelectedDocument", response.data[0], {
+                root: true,
+              });
+
+              dispatch("document/pollDocumentEndpoint", null, {
+                root: true,
+              });
             }
-
-            resolve(null);
-          } else {
-            resolve(response);
           }
+          resolve(response);
         })
         .catch((error) => {
           reject(error.response);

package/src/store/project.js

@@ -67,7 +67,7 @@ const actions = {
   fetchCurrentUser: ({ commit }) => {
     return HTTP.get(`/auth/me/`)
       .then((response) => {
-        commit("SET_CURRENT_USER", response.data.username);
+        commit("SET_CURRENT_USER", response.data);
       })
       .catch((error) => {
         console.log(error);
@@ -88,7 +88,7 @@ const actions = {
 
   fetchDocumentList: ({ commit, state }, parameters) => {
     return HTTP.get(
-      `documents/?project=${state.projectId}&assignee=${state.currentUser}&limit=100&${parameters}`
+      `documents/?project=${state.projectId}&assignee=${state.currentUser.username}&limit=100&${parameters}`
     )
       .then((response) => {
         if (response.data.results) {

package/src/utils/utils.js

@@ -30,10 +30,10 @@ export function navigateToNewDocumentURL(oldId, newId) {
   window.location.replace(newUrl);
 }
 
-export function navigateToDocumentsList(path, projectId) {
+export function navigateToDocumentsList(path, projectId, userId) {
   if (!path) return;
 
-  const parameters = `?project=${projectId}&is_reviewed__exact=0`;
+  const parameters = `?project=${projectId}&is_reviewed__exact=0&assignee__id__exact=${userId}`;
 
   const newPath = `${path}/${parameters}`;