diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts
index d941b1dc5..0ae3eccb3 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.ts
+++ b/src/app/shared/publication/new-publication/new-publication.page.ts
@@ -14,6 +14,8 @@ import { FileValidatorService } from "src/app/services/file/file-validator.servi
import { MiddlewareServiceService } from "src/app/shared/API/middleware/middleware-service.service"
import { LakefsRepositoryService } from '../../repository/lakefs/lakefs-repository.service';
import { ok, err, Result } from 'neverthrow';
+import { SocketConnectionMCRService } from "src/app/services/socket-connection-mcr.service"
+import { CMAPIService } from "src/app/shared/repository/CMAPI/cmapi.service"
enum ActionType {
newRapid = "1",
@@ -72,7 +74,9 @@ export class NewPublicationPage implements OnInit {
public checkFileType: checkFileTypeService,
private FileValidatorService: FileValidatorService,
private MiddlewareServiceService: MiddlewareServiceService,
- private LakefsRepositoryService: LakefsRepositoryService
+ private LakefsRepositoryService: LakefsRepositoryService,
+ private SocketConnectionMCRService: SocketConnectionMCRService,
+ private CMAPIService: CMAPIService
) {
this.publicationTitle = 'Nova Publicação';
@@ -80,6 +84,8 @@ export class NewPublicationPage implements OnInit {
this.seletedContent = this.publication.Files;
this.filecontent = true;
}
+
+ this.SocketConnectionMCRService.connect()
}
ngOnInit() {
@@ -249,12 +255,14 @@ export class NewPublicationPage implements OnInit {
const FileExtension = this.removeTextBeforeSlash(blobFile.mimeType,'/')
+ const file = new File([blobFile.blob], blobFile.name);
+
const newAttachment = new PublicationAttachmentEntity(
{
base64: value,
extension: FileExtension,
- blobFile: blobFile,
- FileType: 'video'
+ blobFile: file,
+ FileType: this.checkFileType.checkFileType(FileExtension)
}
)
@@ -332,46 +340,9 @@ export class NewPublicationPage implements OnInit {
if (this.publicationType == ActionType.edit) {
- const loader = this.toastService.loading()
-
- this.publication = {
- DateIndex: this.publication.DateIndex,
- DocumentId: this.publication.DocumentId,
- ProcessId: this.publication.ProcessId,
- Title: this.pub.Title,
- Message: this.pub.Message,
- DatePublication: this.publication.DatePublication,
- Files: this.seletedContent,
- }
-
-
- this.publication.Files = this.publication.Files.map( e => ({
- FileBase64: e.FileBase64,
- FileExtension: e.FileExtension,
- OriginalFileName: 'foto'
- }))
-
- try {
-
- const response = await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
-
- this.httpErroHandle.httpsSucessMessagge('Editar publicação')
- console.log({ response })
-
- this.goBack();
-
- } catch (error) {
- this.httpErroHandle.httpStatusHandle(error)
- if (error.status == 404) {
- this.PublicationFolderService.deletePost(this.publication.ProcessId, this.publication.DocumentId)
- this.goBack();
- }
- } finally {
- loader.remove()
- }
-/*
- else if (!this.PublicationFolderService.PublicationHasImage(this.publication)) { //
+ if (this.seletedContent.length >= 1) {
+ const loader = this.toastService.loading()
this.publication = {
DateIndex: this.publication.DateIndex,
@@ -380,30 +351,44 @@ export class NewPublicationPage implements OnInit {
Title: this.pub.Title,
Message: this.pub.Message,
DatePublication: this.publication.DatePublication,
- OriginalFileName: this.publication.OriginalFileName,
- Files: "data:image/png;base64,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",
- FileExtension: 'jpeg',
+ Files: this.seletedContent,
}
+
+
+ this.publication.Files = this.publication.Files.map( e => ({
+ FileBase64: e.FileBase64,
+ FileExtension: e.FileExtension,
+ OriginalFileName: 'foto'
+ }))
+
+ try {
+
+ const response = await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
+
+ this.httpErroHandle.httpsSucessMessagge('Editar publicação')
+
+ this.goBack();
+
+ } catch (error) {
+ this.httpErroHandle.httpStatusHandle(error)
+ if (error.status == 404) {
+ this.PublicationFolderService.deletePost(this.publication.ProcessId, this.publication.DocumentId)
+ this.goBack();
+ }
+ } finally {
+ loader.remove()
+ }
+
} else {
- this.publication = {
- DateIndex: this.publication.DateIndex,
- DocumentId: this.publication.DocumentId,
- ProcessId: this.publication.ProcessId,
- Title: this.pub.Title,
- Message: this.pub.Message,
- DatePublication: this.publication.DatePublication,
- OriginalFileName: this.publication.OriginalFileName,
- Files: this.publication.Files,
- FileExtension: this.publication.FileExtension,
- }
+ this.toastService._badRequest("É necessário adicionar um anexo")
+ }
- } */
}
else {
let time = new Date()
- if (this.seletedContent.length > 0) {
+ if (this.seletedContent.length >= 1) {
this.publication = {
DateIndex: time,
DocumentId: null,
@@ -415,16 +400,14 @@ export class NewPublicationPage implements OnInit {
Files: this.seletedContent,
}
-
- // this.publicationFormMV.setDataToFrom(this.publication)
-
- // this.publicationFormMV.uploadVideosFiles()
-
this.publication.Files = this.publication.Files.map( e => ({
FileBase64: e.FileBase64,
FileExtension: e.FileExtension,
OriginalFileName: 'foto'
}))
+
+ // this.publicationFormMV.setDataToFrom(this.publication)
+ // this.publicationFormMV.uploadVideosFiles()
const loader = this.toastService.loading()
@@ -448,7 +431,7 @@ export class NewPublicationPage implements OnInit {
} else {
-
+ this.toastService._badRequest("É necessário adicionar um anexo")
}
}
@@ -973,18 +956,19 @@ export class NewPublicationPage implements OnInit {
class UploadFileUseCase {
- LakefsRepositoryService: LakefsRepositoryService = window["LakefsRepositoryService"]
+ LakefsRepositoryService: CMAPIService = window["CMAPIService"]
constructor() {}
async execute(ChucksManager: ChucksManager): Promise
> {
- let path;
+ let path: string;
+ const length = ChucksManager.chunks.totalChunks.toString()
function makeFrom({blobFile, index, path}) {
const formData = new FormData();
formData.append("blobFile", blobFile);
- formData.append("length", ChucksManager.chunks.totalChunks.toString());
+ formData.append("length", length);
formData.append("index", index.toString());
formData.append("path", path);
@@ -999,7 +983,7 @@ class UploadFileUseCase {
const form = makeFrom({blobFile, index, path})
- return await this.LakefsRepositoryService.uploadFile(form)
+ return await this.LakefsRepositoryService.FileContent({length, path, index, blobFile})
}
if(!ChucksManager.hasPath()) {
@@ -1010,10 +994,13 @@ class UploadFileUseCase {
const blobFile = new File([blob], "test.mp4", { type: blob.type });
const form = makeFrom({blobFile, index: initIndex, path})
- const uploadRequest = await this.LakefsRepositoryService.uploadFile(form)
+ const uploadRequest = await this.LakefsRepositoryService.FileContent({length, path, index: initIndex, blobFile})
if(uploadRequest.isOk()) {
+
path = uploadRequest.value.path
+ ChucksManager.setPath(path)
+ ChucksManager.setResponse(initIndex, uploadRequest.value as any)
} else {
return err(ChucksManager)
}
@@ -1025,6 +1012,8 @@ class UploadFileUseCase {
if(uploadRequest.isErr()) {
return err(ChucksManager)
+ } else {
+ ChucksManager.setResponse(index, uploadRequest.value as any)
}
}
@@ -1119,12 +1108,11 @@ class PublicationFormMV {
private async upload(PublicationAttachmentEntity: PublicationAttachmentEntity) {
const fileBlob = PublicationAttachmentEntity.blobFile;
- const fileChunks = new Chunks({chunkSize: 1024 })
+ const fileChunks = new Chunks({chunkSize: 100 })
fileChunks.setFile(fileBlob)
PublicationAttachmentEntity.setChunkManger(fileChunks)
-
const ChucksManagers = new ChucksManager({chunks: fileChunks})
this.UploadFileUseCase.execute(ChucksManagers)
@@ -1150,7 +1138,7 @@ class Chunks {
private file: File
constructor({chunkSize}) {
- this.chunkSize = chunkSize
+ this.chunkSize = chunkSize * 1024
}
get totalChunks () {
@@ -1159,6 +1147,8 @@ class Chunks {
// Function to read a chunk of the file
readChunk(start: number, end: number): Promise {
+ const file = this.file
+
return new Promise((resolve, reject) => {
const reader = new FileReader();
reader.onload = () => {
@@ -1168,7 +1158,8 @@ class Chunks {
reject(new Error("Failed to read chunk"));
}
};
- reader.readAsArrayBuffer(this.file.slice(start, end));
+
+ reader.readAsArrayBuffer(file.slice(start, end));
});
}
@@ -1196,11 +1187,11 @@ interface IUploadResponse {
class ChucksManager {
chunks: Chunks
- uploads: IUploadResponse[] = []
- path: string =''
+ uploads: {[key: string]: IUploadResponse } = {}
+ path: string = undefined
get uploadsCount() {
- return this.uploads.length
+ return Object.entries(this.uploads).length
}
uploadFunc: Function
@@ -1215,4 +1206,8 @@ class ChucksManager {
hasPath() {
return this.path != undefined
}
+
+ setResponse(index, UploadResponse) {
+ this.uploads[index] = UploadResponse
+ }
}
diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html
index 29de9e485..0df78345c 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.html
+++ b/src/app/shared/publication/view-publications/view-publications.page.html
@@ -58,6 +58,10 @@
+