PATCH: fix(visa): properly handle visa on document with history

Author: NicolasRichel

src/components/specific/files/visas-table/VisasTable.vue

@@ -94,17 +94,18 @@ import { computed, watch, ref } from "vue";
 import { useI18n } from "vue-i18n";
 import { useStandardBreakpoints } from "../../../../composables/responsive.js";
 import { VISA_STATUS, VALIDATION_STATUS } from "../../../../config/visa.js";
-import { enhanceVisa } from "../../../../utils/visas.js";
 import { useFiles } from "../../../../state/files.js";
-
+import { useProjects } from "../../../../state/projects.js";
 import { useUser } from "../../../../state/user.js";
 import { fullName } from "../../../../utils/users.js";
+import { enhanceVisa } from "../../../../utils/visas.js";
 import columnsDef, { columnsLG, columnsXL, columnsXXL } from "./columns.js";
 
 import UserAvatarList from "../../users/user-avatar-list/UserAvatarList.vue";
 import VisaActionsCell from "./visa-actions-cell/VisaActionsCell.vue";
 import FilePathCell from "../files-table/file-path-cell/FilePathCell.vue";
 import VisaValidatorCell from "./visa-validator-cell/VisaValidatorCell.vue";
+
 export default {
   components: {
     UserAvatarList,
@@ -118,7 +119,6 @@ export default {
     },
     visas: {
       type: Array,
-      default: () => [],
       required: true,
     },
     selection: {
@@ -128,13 +128,23 @@ export default {
   emits: ["delete", "file-clicked", "go-folders-view", "reach-visa", "selection-changed"],
   setup(props) {
     const { t } = useI18n();
-    const { user } = useUser();
     const { isLG, isXL, isXXL } = useStandardBreakpoints();
 
+    const { user } = useUser();
+    const { currentProject } = useProjects();
     const { fileStructureHandler: handler } = useFiles();
 
-    const enhancedVisas = computed(() =>
-      props.visas.map((visa) => enhanceVisa(visa, user.value, t, handler)),
+    const enhancedVisas = ref([]);
+    watch(
+      () => props.visas,
+      async () => {
+        enhancedVisas.value = await Promise.all(
+          props.visas.map((visa) => enhanceVisa(visa, user.value, currentProject.value, t, handler))
+        ).then(
+          visas => visas.filter(visa => !!visa)
+        );
+      },
+      { immediate: true }
     );
 
     const columns = computed(() => {
@@ -202,9 +212,9 @@ export default {
 
     return {
       columns,
+      enhancedVisas,
       user,
       fullName,
-      enhancedVisas,
       isCreator,
       isDelay,
       statusClasses,

src/components/specific/visa/visa-summary/VisaSummary.vue

@@ -156,7 +156,7 @@
             <BIMDataTextbox
               class="visa-summary__shell__file__content__name"
               :text="formatedVisa.document.name"
-              @click="$emit('preview-visa', formatedVisa.document.file)"
+              @click="$emit('preview-visa', formatedVisa.document)"
               width="calc(100% - 20px - 12px * 3)"
             />
           </div>
@@ -169,8 +169,8 @@
               height="40px"
               @click="
                 $emit('reach-file', {
-                  ...formatedVisa.document,
-                  nature: formatedVisa.document.model_id ? 'Model' : 'Document',
+                  id: formatedVisa.document.head_id ?? formatedVisa.document.id,
+                  nature: 'Document',
                 })
               "
             >
@@ -296,10 +296,6 @@ export default {
         ...visa.creator,
         fullName: visa.creator ? fullName(visa.creator) : t("Visa.summary.deletedUser"),
       },
-      document: {
-        ...visa.document,
-        file: handler.get({ id: visa.document.id, nature: "Document" }),
-      },
       validations: visa.validations
         .map((validation) => ({
           ...validation,

src/utils/visas.js

@@ -1,9 +1,10 @@
-import { fullName } from "./users.js";
 import { VISA_STATUS, VALIDATION_STATUS } from "../config/visa.js";
+import FileService from "../services/FileService.js";
+import { fullName } from "./users.js";
 
 const safeFullName = (user) => (user ? fullName(user) : "");
 
-export const enhanceVisa = (visa, user, t, handler) => {
+export const enhanceVisa = async (visa, user, project, t, handler) => {
   const validationType = () => {
     if (visa.status === VISA_STATUS.CLOSE) {
       return t("Visa.view.visaClosed");
@@ -39,10 +40,19 @@ export const enhanceVisa = (visa, user, t, handler) => {
     return emailValidators;
   };
 
-  const document = handler.get({
-    id: visa.document.head_id ?? visa.document.id,
-    nature: "Document",
-  });
+  let document
+  try {
+    document = handler.get({
+      id: visa.document.id,
+      nature: "Document",
+    });
+    if (!document) {
+      document = await FileService.getDocument(project, { id: visa.document_id });
+    }
+  } catch (error) {
+    console.error("[Visa Utils]", error);
+  }
+  if (!document) return;
 
   return {
     ...visa,