From 71877aa8d0ff6909aeb10cafbd0746bd1d7c98c9 Mon Sep 17 00:00:00 2001
From: Denys Vuika <denis.vuyka@gmail.com>
Date: Tue, 3 Jan 2017 21:13:17 +0000
Subject: [PATCH] upgrade 'create folder' action

---
 .../src/components/document-list.html         |  9 ++++---
 .../src/components/document-menu-action.ts    | 26 +++++++------------
 .../src/services/document-list.service.ts     | 11 +++-----
 3 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html
index abd59d7584..88b308b02a 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html
@@ -1,7 +1,8 @@
-<alfresco-document-menu-action *ngIf="creationMenuActions"
-                               [currentFolderPath]="currentFolderPath"
-                               (success)="onActionMenuSuccess($event)"
-                               (error)="onActionMenuError($event)">
+<alfresco-document-menu-action
+    *ngIf="creationMenuActions"
+    [folderId]="currentFolderId"
+    (success)="onActionMenuSuccess($event)"
+    (error)="onActionMenuError($event)">
 </alfresco-document-menu-action>
 <alfresco-datatable
     [data]="data"
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts
index ef8364d7d0..7fef161ca0 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts
@@ -15,16 +15,10 @@
  * limitations under the License.
  */
 
-import {
-    Component,
-    OnInit,
-    Input,
-    Output,
-    EventEmitter,
-    ViewChild
-} from '@angular/core';
-import { DocumentListService } from './../services/document-list.service';
+import { Component, Input, Output, EventEmitter, ViewChild } from '@angular/core';
 import { AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { MinimalNodeEntity } from 'alfresco-js-api';
+import { DocumentListService } from './../services/document-list.service';
 import { ContentActionModel } from './../models/content-action.model';
 
 declare let dialogPolyfill: any;
@@ -37,10 +31,10 @@ const ERROR_FOLDER_ALREADY_EXIST = 409;
     styleUrls: ['./document-menu-action.css'],
     templateUrl: './document-menu-action.html'
 })
-export class DocumentMenuAction implements OnInit {
+export class DocumentMenuAction {
 
     @Input()
-    currentFolderPath: string;
+    folderId: string;
 
     @Output()
     success = new EventEmitter();
@@ -66,16 +60,14 @@ export class DocumentMenuAction implements OnInit {
         }
     }
 
-    ngOnInit() {}
-
     public createFolder(name: string) {
         this.cancel();
-        this.documentListService.createFolder(name, this.currentFolderPath)
+        this.documentListService.createFolder(name, this.folderId)
             .subscribe(
-                res => {
-                    let relativeDir = this.currentFolderPath;
+                (res: MinimalNodeEntity) => {
                     this.folderName = '';
-                    this.success.emit({value: relativeDir});
+                    console.log(res.entry);
+                    this.success.emit({node: res.entry});
                 },
                 error => {
                     let errorMessagePlaceholder = this.getErrorMessage(error.response);
diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts
index 35fdef6d75..cfb12fd701 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts
@@ -96,15 +96,12 @@ export class DocumentListService {
 
     /**
      * Create a new folder in the path.
-     * @param name
-     * @param path
+     * @param name Folder name
+     * @param parentId Parent folder ID
      * @returns {any}
      */
-    createFolder(name: string, path: string): Observable<any> {
-        return Observable.fromPromise(this.apiService.getInstance().nodes.createFolder(name, path))
-            .map(res => {
-                return res;
-            })
+    createFolder(name: string, parentId: string): Observable<MinimalNodeEntity> {
+        return Observable.fromPromise(this.apiService.getInstance().nodes.createFolder(name, '/', parentId))
             .catch(this.handleError);
     }