inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-3499] adding new dialog for external content file (#3799)

Browse Source 
* [ADF-3499] start creation of login dialog component with extra auth service feature

* [ADF-3499] adding new dialog for external content file

* [ADF-3499] fixed condition for pop up and added prefix ticket

* [ADF-3499] fixed smartfolder bug for content node selector

* [ADF-3499] disabling preview after uploading for external resource files

* [ADF-3499] fixed unit test for document list service

* [ADF-3499] added unit test to new components

* [ADF-3499] added translation and some fix

* [ADF-3499] fixed labels

* [ADF-3499] fixed problem with node and node entry for smart folders

* [ADF-3499] fixed compilation problem
This commit is contained in:
Vito
2018-09-25 21:46:54 +01:00
committed by Eugenio Romano
parent 0d78e35de1
commit a0b452bf83
39 changed files with 1154 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/process-services/content-widget/attach-file-widget.component.ts
View File

@@ -26,12 +26,15 @@ import {
ProcessContentService,
ActivitiContentService,
ContentService,
FormEvent
FormEvent,
AppConfigValues,
AppConfigService
} from '@alfresco/adf-core';
import { ContentNodeDialogService } from '@alfresco/adf-content-services';
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { from, zip, of } from 'rxjs';
import { mergeMap } from 'rxjs/operators';
import { AttachFileWidgetDialogService } from './attach-file-widget-dialog.service';
@Component({
selector: 'attach-widget',
@@ -61,7 +64,9 @@ export class AttachFileWidgetComponent extends UploadWidgetComponent implements
public processContentService: ProcessContentService,
private activitiContentService: ActivitiContentService,
private contentService: ContentService,
private contentDialog: ContentNodeDialogService) {
private contentDialog: ContentNodeDialogService,
private appConfigService: AppConfigService,
private attachDialogService: AttachFileWidgetDialogService) {
super(formService, logger, thumbnails, processContentService);
}
@@ -150,6 +155,10 @@ export class AttachFileWidgetComponent extends UploadWidgetComponent implements
}
onAttachFileClicked(file: any) {
if (file.isExternal) {
this.logger.info(`The file ${file.name} comes from an external source and cannot be showed at this moment`);
return;
}
if (this.isTemporaryFile(file)) {
this.formService.formContentClicked.next(file);
} else {
@@ -172,27 +181,41 @@ export class AttachFileWidgetComponent extends UploadWidgetComponent implements
}
}
openSelectDialog(repoId: string, repoName: string) {
const accountIdentifier = 'alfresco-' + repoId + '-' + repoName;
this.contentDialog.openFileBrowseDialogBySite().subscribe(
(selections: MinimalNodeEntryEntity[]) => {
this.tempFilesList.push(...selections);
this.uploadFileFromCS(selections, accountIdentifier);
});
openSelectDialog(repository) {
const accountIdentifier = 'alfresco-' + repository.id + '-' + repository.name;
let currentECMHost = this.getDomainHost(this.appConfigService.get(AppConfigValues.ECMHOST));
let chosenRepositoryHost = this.getDomainHost(repository.repositoryUrl);
if (chosenRepositoryHost !== currentECMHost) {
let formattedReporistoryHost = repository.repositoryUrl.replace('/alfresco', '');
this.attachDialogService.openLogin(formattedReporistoryHost).subscribe(
(selections: any[]) => {
selections.forEach((node) => node.isExternal = true);
this.tempFilesList.push(...selections);
this.uploadFileFromCS(selections, accountIdentifier);
});
} else {
this.contentDialog.openFileBrowseDialogBySite().subscribe(
(selections: MinimalNodeEntryEntity[]) => {
this.tempFilesList.push(...selections);
this.uploadFileFromCS(selections, accountIdentifier);
});
}
}
private uploadFileFromCS(fileNodeList: MinimalNodeEntryEntity[], accountId: string, siteId?: string) {
private uploadFileFromCS(fileNodeList: any[], accountId: string, siteId?: string) {
const filesSaved = [];
from(fileNodeList).pipe(
mergeMap(node =>
zip(
of(node.content.mimeType),
this.activitiContentService.applyAlfrescoNode(node, siteId, accountId)
this.activitiContentService.applyAlfrescoNode(node, siteId, accountId),
of(node.isExternal)
)
)
)
.subscribe(([mymeType, res]) => {
.subscribe(([mymeType, res, isExternal]) => {
res.mimeType = mymeType;
res.isExternal = isExternal;
filesSaved.push(res);
},
(error) => {
@@ -205,4 +228,9 @@ export class AttachFileWidgetComponent extends UploadWidgetComponent implements
});
}
private getDomainHost(urlToCheck) {
let result = urlToCheck.match('^(?:https?:\/\/)?(?:[^@\/\n]+@)?(?:www\.)?([^:\/?\n]+)');
return result[1];
}
}