From 97eb89eea892fba04096ab94a2c9535f9a594368 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 11 Apr 2024 14:20:45 +0100 Subject: [PATCH 1/2] fix upload --- src/app/pages/publications/publications.page.ts | 1 + .../shared/publication/upload/publication-from-mv.service.ts | 3 ++- src/environments/environment.ts | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index b8ead0c49..1822e4b1e 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -381,6 +381,7 @@ export class PublicationsPage implements OnInit { }); modal.onDidDismiss().then(() => { + this.intent = window["sharedContent"] this.doRefresh(event); this.checkQueryParameter(); }); diff --git a/src/app/shared/publication/upload/publication-from-mv.service.ts b/src/app/shared/publication/upload/publication-from-mv.service.ts index d49f9dd87..6b61db789 100644 --- a/src/app/shared/publication/upload/publication-from-mv.service.ts +++ b/src/app/shared/publication/upload/publication-from-mv.service.ts @@ -170,8 +170,9 @@ export class PublicationFromMvService { if(upload) { this.form.Files = this.form.Files.map((e:PublicationAttachmentEntity) => { + console.log({e}) if(e.FileType == 'video' && e.toUpload) { - e.OriginalFileName = e.chucksManager.path.replace(".mp4", "") + e.OriginalFileName = e?.chucksManager?.path?.replace(".mp4", "") || e.OriginalFileName e.FileExtension = e.FileExtension || "mp4" e.Base64 = '' } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 8982b9007..03d2a6508 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,4 +4,4 @@ import { environment as oaprDev } from './suport/oapr' import { DevDev } from './suport/dev' -export const environment: Environment = DevDev +export const environment: Environment = oaprDev From ceda431a83a71d0f28d86d3baebbfa9c2fc810d8 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 11 Apr 2024 17:03:35 +0100 Subject: [PATCH 2/2] fix upload --- src/app/pages/publications/publications.page.ts | 4 ++-- .../shared/publication/upload/publication-from-mv.service.ts | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 1822e4b1e..363a5ff70 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -116,7 +116,7 @@ export class PublicationsPage implements OnInit { if (event instanceof NavigationEnd && event.url == pathname) { console.log('=================', this.publicationFolderService.gotoAction) this.getActions(); - this.checkQueryParameter() + // this.checkQueryParameter() } this.intent = window['sharedContent'] }); @@ -382,7 +382,7 @@ export class PublicationsPage implements OnInit { modal.onDidDismiss().then(() => { this.intent = window["sharedContent"] - this.doRefresh(event); + // this.doRefresh(event); this.checkQueryParameter(); }); await modal.present(); diff --git a/src/app/shared/publication/upload/publication-from-mv.service.ts b/src/app/shared/publication/upload/publication-from-mv.service.ts index 6b61db789..729e347ab 100644 --- a/src/app/shared/publication/upload/publication-from-mv.service.ts +++ b/src/app/shared/publication/upload/publication-from-mv.service.ts @@ -170,9 +170,8 @@ export class PublicationFromMvService { if(upload) { this.form.Files = this.form.Files.map((e:PublicationAttachmentEntity) => { - console.log({e}) if(e.FileType == 'video' && e.toUpload) { - e.OriginalFileName = e?.chucksManager?.path?.replace(".mp4", "") || e.OriginalFileName + e.OriginalFileName = e.chucksManager?.path?.replace(".mp4", "") || e.OriginalFileName e.FileExtension = e.FileExtension || "mp4" e.Base64 = '' }