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

[ADF-3294] fixed drag and drop folder to onto a folder (#3550)

Browse Source
This commit is contained in:
Vito
2018-07-02 19:15:52 +01:00
committed by Eugenio Romano
parent d4ebfb462e
commit de126670ee
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/content-services/upload/components/upload-drag-area.component.spec.ts
View File

@@ -367,7 +367,36 @@ describe('UploadDragAreaComponent', () => {
addToQueueSpy.and.callFake((fileList) => {
expect(fileList.name).toBe('file');
expect(fileList.options.path).toBe('/pippo');
expect(fileList.options.path).toBe('pippo/');
});
let fakeCustomEvent: CustomEvent = new CustomEvent('CustomEvent', {
detail: {
data: getFakeShareDataRow(),
files: [fakeItem]
}
});
component.onUploadFiles(fakeCustomEvent);
}));
it('should upload a folder to a specific target folder when dropped onto one', async(() => {
let fakeItem = {
fullPath: '/folder-fake/file-fake.png',
isDirectory: false,
isFile: true,
name: 'file-fake.png',
relativeFolder: '/super',
file: (callbackFile) => {
let fileFake = new File(['fakefake'], 'file-fake.png', { type: 'image/png' });
callbackFile(fileFake);
}
};
addToQueueSpy.and.callFake((fileList) => {
expect(fileList.name).toBe('file');
expect(fileList.options.path).toBe('pippo/super');
});
let fakeCustomEvent: CustomEvent = new CustomEvent('CustomEvent', {

2
lib/content-services/upload/components/upload-drag-area.component.ts
View File

@@ -121,7 +121,7 @@ export class UploadDragAreaComponent extends UploadBase implements NodePermissio
let fileInfo: FileInfo[] = event.detail.files;
if (this.isTargetNodeFolder(event)) {
const destinationFolderName = event.detail.data.obj.entry.name;
fileInfo.map((file) => file.relativeFolder = file.relativeFolder.concat(destinationFolderName));
fileInfo.map((file) => file.relativeFolder = destinationFolderName ? destinationFolderName.concat(file.relativeFolder) : file.relativeFolder);
}
if (fileInfo && fileInfo.length > 0) {
this.uploadFilesInfo(fileInfo);