lasta chnages

src/app/shared/chat/group-messages/group-messages.page.ts

@@ -695,29 +695,52 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
 
 
   async addFileToChat(types: typeof FileType[] ) {
+
     const roomId = this.roomId
 
     const file: any = await this.fileService.getFileFromDevice(types);
-    const imageData =  await this.fileToBase64Service.convert(file)
+    console.log('Add file', file)
+    /* const imageData =  await this.fileToBase64Service.convert(file).then((filee) => {
+      console.log('Add file', filee)
+    }) */
+    const blob = new Blob([file],{type: file.type})
+    console.log('Add file', blob)
 
     const formData = new FormData();
-    formData.append("blobFile", file);
+    formData.append("blobFile", blob);
+
+    let pdfBase64;
+    this.blobToBase64(blob).then(res => {
+      console.log('Base64 pdf', res);
+      this.wsChatMethodsService.getGroupRoom(roomId).send({
+        file: {
+          "type": file.type,
+          "guid": '',
+        },
+        attachments: [{
+          "title": file.name ,
+          "name": file.name ,
+          "image_url": res,
+          // "text": "description",
+          "title_link_download": false,
+        }],
+        temporaryData: formData
+      })
+    });
+
 
-    this.wsChatMethodsService.getGroupRoom(roomId).send({
-      file: {
-        "type": "application/img",
-        "guid": ''
-      },
-      temporaryData: formData,
-      attachments: [{
-        "title": file.name ,
-        "image_url": imageData,
-        "text": "description",
-        "title_link_download": false,
-      }]
-    })
   }
 
+  blobToBase64 = blob => {
+    const reader = new FileReader();
+    reader.readAsDataURL(blob);
+    return new Promise(resolve => {
+      reader.onloadend = () => {
+        resolve(reader.result);
+      };
+    });
+  };
+
   bookMeeting() {
     let data = {
       roomId: this.roomId,
@@ -812,12 +835,19 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
           //this.downloadProgess = Math.round((100 * event.loaded) / event.total);
           console.log('FILE TYPE 33', msg.file.type)
         } else if (event.type === HttpEventType.Response) {
-          this.downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), ''));
-
-          msg.file = {
-            guid: msg.file.guid,
+          if (msg.file.type == "application/img") {
+            this.downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), ''));
+          } else if (msg.file.type === 'application/pdf') {
+            
+            this.downloadFile = event.body;
+          }
+  
+          msg.attachments[0] = {
             image_url: this.downloadFile,
-            type: msg.file.type
+            name: msg.attachments[0].name,
+            title: msg.attachments[0].title,
+            title_link_download: msg.attachments[0].title_link_download,
+            ts: msg.attachments[0].ts
           }
 
           await this.storage.set(msg.file.guid, this.downloadFile).then(() => {
@@ -833,7 +863,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
 
   async openPreview(msg) {
 
-    if (msg.attachments[0].image_url === null || msg.attachments[0].image_url  === '' ) {
+    if (!msg.attachments[0].image_url || msg.attachments[0].image_url === null || msg.attachments[0].image_url  === '' ) {
       this.downloadFileMsg(msg)
 
     } else {
@@ -842,6 +872,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
         cssClass: 'modal modal-desktop',
         componentProps: {
           image: msg.attachments[0].image_url,
+          type: msg.file.type,
           username: msg.u.name,
           _updatedAt: msg._updatedAt
         }