fix publication load and expediente

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -94,6 +94,10 @@ export class ExpedienteDetailPage implements OnInit {
         this.caller = params["params"].caller;
       }
     });
+
+    window['attachments-expediente-update'] = () => {
+      this.LoadTaskDetail(this.serialNumber);
+    }
   }
 
   ngOnInit() {

src/app/services/socket-connection-mcr.service.ts

@@ -5,7 +5,7 @@ import { v4 as uuidv4 } from 'uuid'
 import { HttpClient, HttpHeaders, HttpEventType } from '@angular/common/http';
 import { CMAPIService } from '../shared/repository/CMAPI/cmapi.service';
 import { HubConnectionBuilder } from '@microsoft/signalr';
-import { ok, err, Result } from 'neverthrow';
+import { ok, err as Err, Result } from 'neverthrow';
 @Injectable({
   providedIn: 'root'
 })
@@ -148,13 +148,21 @@ class ReconnectingWebSocketSignalR {
 
   commit(path): Promise<Result<true, false>>  {
     return new Promise((resolve, reject) => {
-      this.connection.invoke("CommitUpload", path).then((e) => {
+      try {
-        console.log("commit message", e)
+        console.log('this.connection.invoke', this.connection)
-        resolve(ok(true))
+        this.connection.invoke("CommitUpload", path).then((e) => {
-      }).catch(err => {
+          console.log("commit message", e)
-        resolve(err(false))
+          resolve(ok(true))
-        console.error(err.toString())
+        }).catch(err => {
-      });
+          console.error('upload catch commit error')
+          resolve(Err(false))
+          console.error(err.toString())
+        });
+      } catch(error) {
+        resolve(Err(false))
+        console.error('upload commit error')
+        console.error(error)
+      }
     })
   }
 
@@ -390,42 +398,42 @@ export class ObjectMergeNotification{
   watchCount  = 0
 
   constructor() {
-    // this.socket.onDisconnectCallback(()=> {
+    this.socket.onDisconnectCallback(()=> {
-    //   console.log("run watch")
+      console.log("run watch")
-    //   this.runWatch = true
+      this.runWatch = true
-    //   this.watch()
+      this.watch()
-    // })
+    })
 
-    // this.socket.onConnectCallback(()=> {
+    this.socket.onConnectCallback(()=> {
 
-    //   console.log("open trigger")
+      console.log("open trigger")
-    //   this.runWatch = false
+      this.runWatch = false
-    // })
+    })
 
-    // this.socket.subscribe((data: socketResponse) => {
+    this.socket.subscribe((data: socketResponse) => {
-    //   if(data.IsCompleted == true) {
+      if(data.IsCompleted == true) {
-    //     console.log("==================!!!====================")
+        console.log("==================!!!====================")
-    //     try {
+        try {
-    //       this.callbacks[data.Guid](data)
+          this.callbacks[data.Guid](data)
-    //       delete this.callbacks[data.Guid]
+          delete this.callbacks[data.Guid]
-    //     } catch (error) {}
+        } catch (error) {}
-    //   } else {
+      } else {
-    //     console.log("else", data)
+        console.log("else", data)
-    //   }
+      }
-    // })
+    })
 
-    // this.socket.connect();
+  //  this.socket.connect();
-    // this.watch()
+   // this.watch()
   }
 
   connect() {
-    this.socket.connect();
+//    this.socket.connect();
   }
 
   close() {
-    this.socket.disconnect();
+    // this.socket.disconnect();
-    this.watchCount = 0;
+    // this.watchCount = 0;
-    this.runWatch = false
+    // this.runWatch = false
   }
 
   async watch() {

src/app/shared/gabinete-digital/expedients/expedients.page.ts

@@ -33,7 +33,7 @@ export class ExpedientsPage implements OnInit {
   listSubscription : {
     delete(): void;
   }
-  
+
   routerSubscription;
 
 
@@ -69,7 +69,7 @@ export class ExpedientsPage implements OnInit {
       }
     })
 
-    
+
     this.routerSubscription = this.router.events.subscribe((event) => {
       if (event instanceof NavigationStart &&
         event.url.startsWith('/home/gabinete-digital?expedientes=true')) {
@@ -81,8 +81,8 @@ export class ExpedientsPage implements OnInit {
       this.LoadList()
     }
 
-    
+
-    
+
     this.dynamicSearch();
 
   }
@@ -91,7 +91,7 @@ export class ExpedientsPage implements OnInit {
     this.listSubscription.delete()
     this.routerSubscription?.unsubscribe();
   }
-    
+
   reorderList(orderBy: string) {
 
     this.ordinance = orderBy;
@@ -103,7 +103,7 @@ export class ExpedientsPage implements OnInit {
   async dynamicSearch() {
 
     if(this.showSearch && this.searchSubject) {
-      
+
       const list = this.expedientegbstore.list.filter((task) => {
         let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
         subject = subject.toLowerCase();
@@ -143,7 +143,7 @@ export class ExpedientsPage implements OnInit {
     this.skeletonLoader = true
 
     this.processes.GetTaskListExpediente(false).subscribe(result => {
-      
+
       let taskslist = [];
       this.skeletonLoader = false
 
@@ -152,7 +152,7 @@ export class ExpedientsPage implements OnInit {
       taskslist = res.map((e) => this.expedienteTaskPipe.transform(e))
       taskslist = this.sortService.sortDate(taskslist, 'CreateDate')
       // this.addProcessTODb(taskslist);
-      
+
       taskslist = taskslist.filter(function(item) {
         return item.activityInstanceName != 'Retificar Expediente'
       })

src/app/shared/popover/opts-expediente/opts-expediente.page.ts

@@ -142,6 +142,7 @@ export class OptsExpedientePage implements OnInit {
             const loader = this.toastService.loading()
 
             this.attachmentsService.AddAttachment(body).subscribe((res)=> {
+              window['attachments-expediente-update']();
               this.toastService._successMessage()
               this.popoverController.dismiss()
             }, (error) => {

src/app/shared/publication/new-publication/new-publication.page.html

@@ -114,7 +114,7 @@
             src="assets/images/theme/gov/icons-add-photos.svg"></ion-icon>
         </div>
         <div class="attach-document cursor-pointer">
-          <ion-label>Galeria</ion-label>
+          <ion-label>Galeria 2</ion-label>
         </div>
       </ion-label>
     </div>
@@ -127,7 +127,7 @@
             src="assets/images/theme/gov/icons-add-photos.svg"></ion-icon>
         </div>
         <div class="attach-document cursor-pointer">
-          <ion-label>Galeria</ion-label>
+          <ion-label>Galeria 1</ion-label>
         </div>
       </ion-label>
     </div>

src/app/shared/publication/new-publication/new-publication.page.ts

@@ -355,7 +355,7 @@ export class NewPublicationPage implements OnInit {
         const upload = await this.publicationFormMV.uploadVideosFiles()
 
         if(upload) {
-          this.publicationFormMV.form.Files = this.publicationFormMV.form.Files.map((e:PublicationAttachmentEntity)=> {
+          this.publicationFormMV.form.Files = this.publicationFormMV.form.Files.map((e:PublicationAttachmentEntity) => {
             if(e.FileType == 'video' && e.blobFile && e.toUpload) {
               e.OriginalFileName = e?.chucksManager?.path?.replace(".mp4", "") || e.OriginalFileName
               e.FileExtension = "mp4"
@@ -406,14 +406,17 @@ export class NewPublicationPage implements OnInit {
 
         const upload = await this.publicationFormMV.uploadVideosFiles()
 
+        console.log({upload})
+
         if(upload) {
           this.publicationFormMV.form.Files = this.publicationFormMV.form.Files.map((e:PublicationAttachmentEntity) => {
             if(e.FileType == 'video' && e.blobFile && e.toUpload) {
               e.OriginalFileName = e.chucksManager.path.replace(".mp4", "")
               e.FileExtension = "mp4"
+              e.Base64 = ''
             }
 
-            if(e.FileType == 'video' ) {
+            if(e.FileType == 'video'  && !e.toUpload) {
               e.Base64 = e.url
             }
 
@@ -454,6 +457,9 @@ export class NewPublicationPage implements OnInit {
             loader.remove()
           }
 
+        } else {
+          this.toastService._badRequest("Tive um erro ao enviar o ficheiro")
+          loader.remove()
         }
 
 

src/app/shared/publication/upload/upload-streaming.service.ts

@@ -240,13 +240,25 @@ export class PublicationFormMV {
     return this.form.Files.filter( x => x.FileType == 'video')
   }
 
+  async commit(PublicationAttachmentEntity: PublicationAttachmentEntity) {
+    PublicationAttachmentEntity.chucksManager.doneChunkUpload()
+    const mergeRequest = await this.ObjectMergeNotification.socket.commit(PublicationAttachmentEntity.chucksManager.path)
+
+    if(mergeRequest.isOk()) {
+      PublicationAttachmentEntity.chucksManager.contentSetReady()
+      return true
+    } else {
+      return false
+    }
+  }
+
   private upload(PublicationAttachmentEntity: PublicationAttachmentEntity) {
 
     return new Promise(async (resolve, reject)=> {
 
       if(!PublicationAttachmentEntity.hasChunkManger) {
         const fileBlob = PublicationAttachmentEntity.blobFile;
-        const fileChunks = new Chunks({chunkSize: 400 })
+        const fileChunks = new Chunks({chunkSize: 50 })
         fileChunks.setFile(fileBlob)
 
         PublicationAttachmentEntity.setChunkManger(fileChunks)
@@ -276,20 +288,16 @@ export class PublicationFormMV {
           resolve(false)
         } else {
 
-          PublicationAttachmentEntity.chucksManager.doneChunkUpload()
+          return await resolve(this.commit(PublicationAttachmentEntity))
-          const mergeRequest = await this.ObjectMergeNotification.socket.commit(PublicationAttachmentEntity.chucksManager.path)
-
-          if(mergeRequest.isOk()) {
-            PublicationAttachmentEntity.chucksManager.contentSetReady()
-            resolve(true)
-          } else {
-            resolve(false)
-          }
 
         }
 
-      } else {
+      } else if ( PublicationAttachmentEntity.chucksManager.contentReady == false) {
 
+        return await resolve(this.commit(PublicationAttachmentEntity))
+
+      } else {
+        console.log('already uploading')
       }
 
     })
@@ -413,6 +421,7 @@ export class ChucksManager {
   contentReady = false
   manualRetry = false
   isUploading = false
+  needToCommit = true
   subscribeToUseCaseResponse: Function[] = []
 
   getUploadPercentage() {
@@ -531,6 +540,10 @@ export class ChucksManager {
     this.onSetLastChunk.forEach(callback => callback());
   }
 
+  doneCommit() {
+    this.needToCommit = false
+  }
+
   contentSetReady() {
     this.merging = false
     this.contentReady = true

src/app/shared/publication/view-publications/view-publications.page.ts

@@ -129,6 +129,10 @@ export class ViewPublicationsPage implements OnInit {
 
     this.stopVideo();
 
+    setTimeout(()=> {
+      this.doRefresh({})
+    }, 1500)
+
 
   }