project-booster-vue 9.0.4 → 9.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "project-booster-vue",
-  "version": "9.0.4",
+  "version": "9.1.0",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/media/upload/PbMediaUpload.vue

@@ -135,10 +135,10 @@
                   <m-radio
                     class="pb-media-upload__preview-document-types-list"
                     name="radio-group"
-                    v-for="type in payload.viewModel.dialog.mediaTypes"
-                    :label="type.label"
-                    :key="type.code"
-                    @click="updateMediaType(type)"
+                    v-for="mediaType in payload.viewModel.dialog.mediaTypes"
+                    :label="mediaType.label"
+                    :key="mediaType.type + '_' + mediaType.subtype"
+                    @click="updateMediaType(mediaType)"
                   />
                 </div>
                 <transition name="pb-media-upload--fade" mode="out-in" @before-leave="beforeLeave">
@@ -209,6 +209,7 @@ import PbStickyFooter from '../../sticky-footer/PbStickyFooter.vue';
 import { isFileTypeValid, MediaValidationErrors, mediaValidator } from './mediaValidator';
 import MEDIA_UPLOAD_PAYLOAD from './media-upload-payload.json';
 import { MediaEventOptions, MediaUploadOptions } from '@/types/pb/Media';
+import { UploadDocumentMediaType } from '@/components/question/upload-document/UploadDocument';
 
 const NAME_MAX_LENGTH = 60;
 const PDF_IMAGE = 'https://storage.googleapis.com/project-booster-media/vad/PDF/visuel_PDF_plan.png';
@@ -269,7 +270,7 @@ export default defineComponent({
       displayAddDialog: false,
       formData: null as FormData | null,
       fileName: null as string | null,
-      selectedType: null as { code: string } | null,
+      selectedType: null as UploadDocumentMediaType | null,
       isRoomPicture: false,
     };
   },
@@ -410,7 +411,8 @@ export default defineComponent({
           formData: this.formData,
           fileName: this.fileName,
           isRoomPicture: this.isRoomPicture,
-          documentType: this.selectedType?.code,
+          documentType: this.selectedType?.type,
+          documentSubtype: this.selectedType?.subtype,
         } as MediaUploadOptions);
       } else {
         this.displayAddDialog = false;
@@ -504,7 +506,7 @@ export default defineComponent({
       return valid;
     },
 
-    updateMediaType(type: { code: string; name: string }) {
+    updateMediaType(type: UploadDocumentMediaType) {
       this.selectedType = type;
     },
   },

package/src/components/media/upload/document-upload-payload.json

@@ -1,6 +1,7 @@
 {
   "viewModel": {
     "title": "Ajouter un document",
+    "acceptedFileTypes": "image/jpeg, image/png, image/heif, image/heic, image/heif-sequence, image/heic-sequence, application/pdf",
     "dialog": {
       "hideCross": false,
       "fullscreen": false,
@@ -14,15 +15,18 @@
       "acceptedMediaTypesErrorLabel": "Seuls les formats JPG et PNG, et PDF sont acceptés",
       "mediaTypes": [
         {
-          "code": "HAND_DRAWN_PLAN",
+          "type": "PLAN",
+          "subtype": "HAND_DRAWN_PLAN",
           "label": "Un plan fait moi même"
         },
         {
-          "code": "ARCHITECT_PLAN",
+          "type": "PLAN",
+          "subtype": "ARCHITECT_PLAN",
           "label": "Un plan d’architecte"
         },
         {
-          "code": "KITCHEN_DESIGNER_PLAN",
+          "type": "PLAN",
+          "subtype": "KITCHEN_DESIGNER_PLAN",
           "label": "Un plan d’un autre cuisiniste"
         }
       ]

package/src/components/projects/project-item-save/PbProjectItemSave.vue

@@ -217,7 +217,7 @@ export default defineComponent({
         try {
           await store.dispatch('projects/saveProjectForItem', {
             projectToSave,
-            metaData: store.getters['metaData/metaData'](cookies),
+            metaData: store.getters['metaData/metaData'],
           });
           projectId = store.getters['projects/getCurrentProjectId'];
         } catch (err) {

package/src/components/question/upload-document/UploadDocument.ts

@@ -19,7 +19,8 @@ export interface UploadDocumentSkippable {
 }
 
 export interface UploadDocumentMediaType {
-  code: string;
+  type: string;
+  subtype: string;
   label: string;
 }
 

package/src/services/api/documentsApi.ts

@@ -22,15 +22,15 @@ const uploadDocument = async (
   formData: FormData,
   inhabitantProjectId: string,
   correlationId: string,
-  subType: string,
   trackProgress: (progressEvent: ProgressEvent) => void,
   fileName: string,
   type: string,
+  subtype: string,
 ) => {
   const [name, file] = formData.entries().next().value;
   const data = new FormData();
   data.append('document', file);
-  data.append('metadata', JSON.stringify({ type: type, correlationId, subType, title: fileName }, null, '\t'));
+  data.append('metadata', JSON.stringify({ type: type, correlationId, subType: subtype, title: fileName }, null, '\t'));
   return await clientApi.post(`/inhabitant-projects/${inhabitantProjectId}/documents`, data, {
     onUploadProgress: trackProgress,
   });

package/src/stores/modules/mediaDocumentsStore.ts

@@ -177,10 +177,10 @@ export const mediaDocumentsUploadStoreOptions = {
             uploadFile.formData,
             state.currentProjectId,
             correlationId,
-            uploadFile.documentType ? uploadFile.documentType : 'ROOM_PHOTO',
             trackProgress,
             uploadFile.fileName,
-            state.context.subType,
+            uploadFile.documentType,
+            uploadFile.documentSubtype,
           );
         }
         const location = response.headers.location;
@@ -436,7 +436,7 @@ export const mediaDocumentsListStoreOptions = {
       commit('setMediaList', []);
       commit('setIsLoadingMedia', false);
       commit('setCurrentMediaPage', 0);
-      commit('setHasStillMedia', true);
+      commit('setHasStillMedia', false);
       commit('setAddedMediaNumber', 0);
       commit('setMediaLoadError', null);
     },
@@ -487,7 +487,7 @@ export const mediaDocumentsListStoreOptions = {
             state.context.subType,
           );
         }
-        commit('addMedia', media.results);
+        commit('addMedia', media.results ? media.results : []);
 
         if (media.total >= 30) {
           commit('setIsAddPhotoDisabled', true);

package/src/types/pb/Media.ts

@@ -16,6 +16,7 @@ export interface MediaUploadOptions {
   fileName: string;
   isRoomPicture: boolean;
   documentType: string;
+  documentSubtype: string;
 }
 
 export interface MediaEventOptions {