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-573] support for toggling enabled state (#1912)

Browse Source
This commit is contained in:
Denys Vuika
2017-05-30 14:28:12 +01:00
committed by Eugenio Romano
parent 4b5eb4bb29
commit 1ffc3cd080
6 changed files with 56 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ng2-components/ng2-alfresco-upload/README.md
View File

@@ -287,12 +287,14 @@ platformBrowserDynamic().bootstrapModule(AppModule);
| --- | --- |
| `onSuccess` | The event is emitted when the file is uploaded |
#### Propertoes
#### Properties
| Name | Type | Default | Description |
| --- | --- | --- | --- |
| `enabled` | *boolean* | true | Toggle component enabled state |
| `showNotificationBar` | *boolean* | true | Hide/show notification bar |
| `currentFolderPath` | *string* | '/Sites/swsdp/documentLibrary' | define the path where the files are uploaded |
| `rootFolderId` | *string* | '-root-' | The ID of the root folder node.
| `currentFolderPath` | *string* | '/' | define the path where the files are uploaded |
| `versioning` | *boolean* | false | Versioning false is the default uploader behaviour and it rename using an integer suffix if there is a name clash. Versioning true to indicate that a major version should be created |

2
ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.html
View File

@@ -1,4 +1,4 @@
<div file-draggable id="UploadBorder" class="upload-border"
<div [file-draggable]="enabled" id="UploadBorder" class="upload-border"
(onFilesDropped)="onFilesDropped($event)"
(onFilesEntityDropped)="onFilesEntityDropped($event)"
(onFolderEntityDropped)="onFolderEntityDropped($event)"

2
ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts
View File

@@ -20,6 +20,7 @@ import { EventEmitter, DebugElement } from '@angular/core';
import { AlfrescoTranslationService, CoreModule, LogService, LogServiceMock, NotificationService } from 'ng2-alfresco-core';
import { UploadDragAreaComponent } from './upload-drag-area.component';
import { FileDraggableDirective } from '../directives/file-draggable.directive';
import { TranslationMock } from '../assets/translation.service.mock';
import { UploadService } from '../services/upload.service';
import { FileModel } from '../models/file.model';
@@ -39,6 +40,7 @@ describe('UploadDragAreaComponent', () => {
CoreModule.forRoot()
],
declarations: [
FileDraggableDirective,
UploadDragAreaComponent
],
providers: [

14
ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts
View File

@@ -20,8 +20,6 @@ import { AlfrescoTranslationService, LogService, NotificationService } from 'ng2
import { UploadService } from '../services/upload.service';
import { FileModel } from '../models/file.model';
declare let componentHandler: any;
const ERROR_FOLDER_ALREADY_EXIST = 409;
/**
@@ -42,6 +40,9 @@ export class UploadDragAreaComponent {
private static DEFAULT_ROOT_ID: string = '-root-';
@Input()
enabled: boolean = true;
@Input()
showNotificationBar: boolean = true;
@@ -73,7 +74,7 @@ export class UploadDragAreaComponent {
onUploadFiles(e: CustomEvent) {
e.stopPropagation();
e.preventDefault();
if (this.enabled) {
let files: File[] = e.detail.files;
if (files && files.length > 0) {
const fileModels = files.map(f => new FileModel(f, { newVersion: this.versioning }));
@@ -85,6 +86,7 @@ export class UploadDragAreaComponent {
}
}
}
}
/**
* Method called when files are dropped in the drag area.
@@ -92,7 +94,7 @@ export class UploadDragAreaComponent {
* @param {File[]} files - files dropped in the drag area.
*/
onFilesDropped(files: FileModel[], rootId?: string, directory?: string): void {
if (files.length) {
if (this.enabled && files.length) {
this.uploadService.addToQueue(...files);
this.uploadService.uploadFilesInTheQueue(rootId || this.rootFolderId, directory || this.currentFolderPath, this.onSuccess);
let latestFilesAdded = this.uploadService.getQueue();
@@ -107,6 +109,7 @@ export class UploadDragAreaComponent {
* @param item - FileEntity
*/
onFilesEntityDropped(item: any): void {
if (this.enabled) {
item.file((file: File) => {
const fileModel = new FileModel(file, { newVersion: this.versioning });
this.uploadService.addToQueue(fileModel);
@@ -115,13 +118,14 @@ export class UploadDragAreaComponent {
this.uploadService.uploadFilesInTheQueue(this.rootFolderId, filePath, this.onSuccess);
});
}
}
/**
* Called when a folder are dropped in the drag area
* @param folder - name of the dropped folder
*/
onFolderEntityDropped(folder: any): void {
if (folder.isDirectory) {
if (this.enabled && folder.isDirectory) {
let relativePath = folder.fullPath.replace(folder.name, '');
relativePath = this.currentFolderPath + relativePath;

18
ng2-components/ng2-alfresco-upload/src/directives/file-draggable.directive.spec.ts
View File

@@ -15,6 +15,7 @@
* limitations under the License.
*/
import { ElementRef } from '@angular/core';
import { FileDraggableDirective } from '../directives/file-draggable.directive';
describe('FileDraggableDirective', () => {
@@ -22,7 +23,22 @@ describe('FileDraggableDirective', () => {
let component: FileDraggableDirective;
beforeEach( () => {
component = new FileDraggableDirective(null, null);
let el = new ElementRef(null);
component = new FileDraggableDirective(el, null);
});
it('should always be enabled by default', () => {
expect(component.enabled).toBeTruthy();
});
it('should not allow drad and drop when disabled', () => {
component.enabled = false;
let event = new CustomEvent('custom-event');
spyOn(event, 'preventDefault').and.stub();
component.onDropFiles(event);
component.onDragEnter(event);
component.onDragLeave(event);
expect(event.preventDefault).not.toHaveBeenCalled();
});
/*

13
ng2-components/ng2-alfresco-upload/src/directives/file-draggable.directive.ts
View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { Directive, EventEmitter, Output, OnInit, OnDestroy, ElementRef, NgZone } from '@angular/core';
import { Directive, EventEmitter, Input, Output, OnInit, OnDestroy, ElementRef, NgZone } from '@angular/core';
/**
* [file-draggable]
@@ -35,6 +35,9 @@ export class FileDraggableDirective implements OnInit, OnDestroy {
files: File [];
@Input('file-draggable')
enabled: boolean = true;
@Output()
onFilesDropped: EventEmitter<any> = new EventEmitter();
@@ -72,7 +75,7 @@ export class FileDraggableDirective implements OnInit, OnDestroy {
* @param event DOM event.
*/
onDropFiles(event: any): void {
if (!event.defaultPrevented) {
if (this.enabled && !event.defaultPrevented) {
this.preventDefault(event);
let items = event.dataTransfer.items;
@@ -120,7 +123,7 @@ export class FileDraggableDirective implements OnInit, OnDestroy {
* @param {event} event - DOM event.
*/
onDragEnter(event: Event): void {
if (!event.defaultPrevented) {
if (this.enabled && !event.defaultPrevented) {
this.preventDefault(event);
this.element.classList.add(this.cssClassName);
}
@@ -132,7 +135,7 @@ export class FileDraggableDirective implements OnInit, OnDestroy {
* @param {event} event - DOM event.
*/
onDragLeave(event: Event): void {
if (!event.defaultPrevented) {
if (this.enabled && !event.defaultPrevented) {
this.preventDefault(event);
this.element.classList.remove(this.cssClassName);
}
@@ -144,7 +147,7 @@ export class FileDraggableDirective implements OnInit, OnDestroy {
* @param event
*/
onDragOver(event: Event): void {
if (!event.defaultPrevented) {
if (this.enabled && !event.defaultPrevented) {
this.preventDefault(event);
this.element.classList.add(this.cssClassName);
}