@syncfusion/ej2-filemanager 21.1.35 → 21.1.39

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 21.1.35
+*  version : 21.1.39
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-filemanager@*",
-  "_id": "@syncfusion/ej2-filemanager@18.20.1",
+  "_id": "@syncfusion/ej2-filemanager@21.1.37",
   "_inBundle": false,
-  "_integrity": "sha512-aWF002IK3S7gXmugPv1V7vnx88KCzVk1ndOj7yJyj8cu11Q/4Lk4B8azq2R8+1Mlyra1qHCFRFoS+RB38D6oIg==",
+  "_integrity": "sha512-qIZ+ACsxbmH7pk4hUbOjqSBaa2pTpdhknvGSIXfsyVXA5S5wgWACAGQqyUu52UEHDgNuM3cDpVjAiHeHY8nBJw==",
   "_location": "/@syncfusion/ej2-filemanager",
   "_phantomChildren": {},
   "_requested": {
@@ -25,8 +25,8 @@
     "/@syncfusion/ej2-richtexteditor",
     "/@syncfusion/ej2-vue-filemanager"
   ],
-  "_resolved": "https://nexus.syncfusion.com/repository/ej2-release/@syncfusion/ej2-filemanager/-/ej2-filemanager-18.20.1.tgz",
-  "_shasum": "6115759f03937e73d38d4967b9e9ce8507850442",
+  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-filemanager/-/ej2-filemanager-21.1.37.tgz",
+  "_shasum": "e9ac521b654f440cfe8dc0b83e465cc564bf44b3",
   "_spec": "@syncfusion/ej2-filemanager@*",
   "_where": "/jenkins/workspace/elease-automation_release_21.1.1/packages/included",
   "author": {
@@ -37,16 +37,16 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~21.1.35",
-    "@syncfusion/ej2-buttons": "~21.1.35",
-    "@syncfusion/ej2-data": "~21.1.35",
-    "@syncfusion/ej2-grids": "~21.1.35",
-    "@syncfusion/ej2-inputs": "~21.1.35",
-    "@syncfusion/ej2-layouts": "~21.1.35",
-    "@syncfusion/ej2-lists": "~21.1.35",
-    "@syncfusion/ej2-navigations": "~21.1.35",
-    "@syncfusion/ej2-popups": "~21.1.35",
-    "@syncfusion/ej2-splitbuttons": "~21.1.35"
+    "@syncfusion/ej2-base": "~21.1.39",
+    "@syncfusion/ej2-buttons": "~21.1.37",
+    "@syncfusion/ej2-data": "~21.1.38",
+    "@syncfusion/ej2-grids": "~21.1.39",
+    "@syncfusion/ej2-inputs": "~21.1.39",
+    "@syncfusion/ej2-layouts": "~21.1.37",
+    "@syncfusion/ej2-lists": "~21.1.39",
+    "@syncfusion/ej2-navigations": "~21.1.39",
+    "@syncfusion/ej2-popups": "~21.1.37",
+    "@syncfusion/ej2-splitbuttons": "~21.1.37"
   },
   "deprecated": false,
   "description": "Essential JS 2 FileManager Component",
@@ -76,6 +76,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "21.1.35",
+  "version": "21.1.39",
   "sideEffects": false
 }

package/src/file-manager/actions/toolbar.js

@@ -231,7 +231,12 @@ var Toolbar = /** @class */ (function () {
                     items[itemCount].iconCss = this.parent.sortBy === 'size' ? CLS.TB_OPTION_DOT : '';
                 }
                 else if (items[itemCount].id === this.getPupupId('date')) {
-                    items[itemCount].iconCss = this.parent.sortBy === '_fm_modified' ? CLS.TB_OPTION_DOT : '';
+                    if (this.parent.sortBy === 'dateModified' || this.parent.sortBy === 'dateCreated') {
+                        items[itemCount].iconCss = this.parent.sortBy === this.parent.sortBy ? CLS.TB_OPTION_DOT : '';
+                    }
+                    else {
+                        items[itemCount].iconCss = this.parent.sortBy === '_fm_modified' ? CLS.TB_OPTION_DOT : '';
+                    }
                 }
                 else if (items[itemCount].id === this.getPupupId('ascending')) {
                     items[itemCount].iconCss = this.parent.sortOrder === 'Ascending' ? CLS.TB_OPTION_TICK : '';

package/src/file-manager/base/interface.d.ts

@@ -2,6 +2,7 @@ import { Component, EmitType, L10n } from '@syncfusion/ej2-base';
 import { Dialog, ButtonPropsModel } from '@syncfusion/ej2-popups';
 import { FileManagerModel } from '../base/file-manager-model';
 import { ToolbarSettingsModel, AjaxSettingsModel } from '../models/index';
+import { DetailsViewSettingsModel } from '../models/details-view-settings-model';
 import { TreeView, ContextMenu, MenuItemModel, ItemModel } from '@syncfusion/ej2-navigations';
 import { DetailsView } from '../layout/details-view';
 import { Toolbar } from '../actions/toolbar';
@@ -638,6 +639,7 @@ export interface IFileManager extends Component<HTMLElement> {
     breadcrumbbarModule: BreadCrumbBar;
     virtualizationModule: Virtualization;
     toolbarSelection: boolean;
+    detailsViewSettings: DetailsViewSettingsModel;
     duplicateItems: string[];
     duplicateRecords: Object[];
     fileAction: string;

package/src/file-manager/common/operations.js

@@ -2,7 +2,7 @@ import { Ajax, createElement, select, extend } from '@syncfusion/ej2-base';
 import { isNullOrUndefined as isNOU, setValue, getValue } from '@syncfusion/ej2-base';
 import * as events from '../base/constant';
 import { createDialog, createExtDialog } from '../pop-up/dialog';
-import { fileType, setNodeId, getLocaleText, setDateObject, doPasteUpdate, getParentPath, getPathObject } from '../common/utility';
+import { fileType, setNodeId, getLocaleText, setDateObject, doPasteUpdate, getPathObject } from '../common/utility';
 import { generatePath } from '../common/utility';
 /**
  * Function to read the content from given path in File Manager.
@@ -415,10 +415,15 @@ function renameSuccess(parent, result, path) {
         var args = { action: 'rename', result: result };
         parent.trigger('success', args);
         parent.renamedItem = result.files[0];
+        if (getValue('filterPath', parent.renamedItem) === getValue('filterPath', parent.itemData[0]) && parent.pathNames.length > 1) {
+            parent.pathNames[parent.pathNames.length - 1] = parent.renameText;
+        }
         if (parent.activeModule === 'navigationpane') {
             parent.pathId.pop();
             parent.itemData = [getValue(parent.pathId[parent.pathId.length - 1], parent.feParent)];
-            read(parent, events.renameEndParent, getParentPath(parent.path));
+            read(parent, events.renameEndParent, getValue('filterPath', parent.renamedItem).replace(/\\/g, '/'));
+            parent.itemData[0] = parent.renamedItem;
+            read(parent, events.pathChanged, parent.path === '/' ? parent.path : getValue('filterPath', parent.renamedItem).replace(/\\/g, '/') + parent.renamedItem.name + '/');
         }
         else {
             parent.itemData = [getPathObject(parent)];

package/src/file-manager/common/utility.d.ts

@@ -293,7 +293,7 @@ export declare function sortbyClickHandler(parent: IFileManager, args: MenuEvent
  * @returns {string} - returns the sorted fields
  * @private
  */
-export declare function getSortField(id: string): string;
+export declare function getSortField(id: string, parent?: IFileManager): string;
 /**
  * Sets the next path
  *

package/src/file-manager/common/utility.js

@@ -694,7 +694,7 @@ export function sortbyClickHandler(parent, args) {
         tick = false;
     }
     if (!tick) {
-        parent.sortBy = getSortField(args.item.id);
+        parent.sortBy = getSortField(args.item.id, parent);
     }
     else {
         parent.sortOrder = getSortField(args.item.id);
@@ -721,12 +721,24 @@ export function sortbyClickHandler(parent, args) {
  * @returns {string} - returns the sorted fields
  * @private
  */
-export function getSortField(id) {
+export function getSortField(id, parent) {
     var text = id.substring(id.lastIndexOf('_') + 1);
     var field = text;
+    var column;
+    if (parent) {
+        column = parent.detailsViewSettings.columns;
+    }
     switch (text) {
         case 'date':
-            field = '_fm_modified';
+            for (var i = 0, len = column.length; i < len; i++) {
+                if (column[i].field === 'dateModified' || column[i].field === 'dateCreated') {
+                    field = column[i].field;
+                    break;
+                }
+                else {
+                    field = '_fm_modified';
+                }
+            }
             break;
         case 'ascending':
             field = 'Ascending';

package/src/file-manager/layout/navigation-pane.d.ts

@@ -20,6 +20,8 @@ export declare class NavigationPane {
     private isPathDragged;
     private isRenameParent;
     private isRightClick;
+    private isSameNodeClicked;
+    private isNodeExpandCalled;
     private renameParent;
     private previousSelected;
     private isNodeClickCalled;

package/src/file-manager/layout/navigation-pane.js

@@ -29,6 +29,8 @@ var NavigationPane = /** @class */ (function () {
         this.isPathDragged = false;
         this.isRenameParent = false;
         this.isRightClick = false;
+        this.isSameNodeClicked = false;
+        this.isNodeExpandCalled = false;
         this.renameParent = null;
         // Specifies the previously selected nodes in the treeview control.
         this.previousSelected = null;
@@ -184,7 +186,7 @@ var NavigationPane = /** @class */ (function () {
     };
     // Node Selecting event handler
     NavigationPane.prototype.onNodeSelecting = function (args) {
-        if (!args.isInteracted && !this.isRightClick && !this.isPathDragged && !this.isRenameParent || this.restrictSelecting) {
+        if (!args.isInteracted && !this.isRightClick && !this.isSameNodeClicked && !this.isPathDragged && !this.isRenameParent || this.restrictSelecting) {
             this.restrictSelecting = false;
             this.isNodeClickCalled = false;
             return;
@@ -193,18 +195,29 @@ var NavigationPane = /** @class */ (function () {
             this.parent.activeModule = 'navigationpane';
             // eslint-disable-next-line
             var nodeData = this.getTreeData(getValue('id', args.nodeData));
-            var eventArgs = { cancel: false, fileDetails: nodeData[0], module: 'NavigationPane' };
-            this.parent.trigger('fileOpen', eventArgs);
-            var selecEventArgs = { action: args.action, fileDetails: nodeData[0], isInteracted: args.isInteracted };
-            this.parent.trigger('fileSelect', selecEventArgs);
-            args.cancel = eventArgs.cancel;
-            if (args.cancel) {
-                this.restrictSelecting = this.isNodeClickCalled ? this.previousSelected[0] !== args.node.getAttribute('data-uid') : false;
-                this.previousSelected = this.treeObj.selectedNodes;
-                this.treeObj.selectedNodes = [args.node.getAttribute("data-uid")];
-                if (!isNOU(this.parent) && !isNOU(this.parent.contextmenuModule)) {
-                    this.parent.contextmenuModule.contextMenu.enableItems(['Open'], true);
+            if (args.node.getAttribute('data-uid') !== this.parent.pathId[this.parent.pathId.length - 1] && !this.isRightClick && !this.isNodeClickCalled || this.isSameNodeClicked) {
+                this.isNodeClickCalled = false;
+                if (!this.isSameNodeClicked) {
+                    this.isSameNodeClicked = true;
+                    var selecEventArgs = { action: args.action, fileDetails: nodeData[0], isInteracted: args.isInteracted };
+                    this.parent.trigger('fileSelect', selecEventArgs);
                 }
+                if (!this.isRightClick && args.node.getAttribute('data-uid') !== this.parent.pathId[this.parent.pathId.length - 1]) {
+                    var eventArgs = { cancel: false, fileDetails: nodeData[0], module: 'NavigationPane' };
+                    this.parent.trigger('fileOpen', eventArgs);
+                    args.cancel = eventArgs.cancel;
+                }
+                if (args.cancel) {
+                    this.restrictSelecting = this.isNodeClickCalled ? this.previousSelected[0] !== args.node.getAttribute('data-uid') : false;
+                    this.isNodeClickCalled = true;
+                    this.isSameNodeClicked = false;
+                    this.previousSelected = this.treeObj.selectedNodes;
+                    this.treeObj.selectedNodes = [args.node.getAttribute("data-uid")];
+                }
+            }
+            else if (this.previousSelected[0] !== args.node.getAttribute('data-uid')) {
+                var selecEventArgs = { action: args.action, fileDetails: nodeData[0], isInteracted: args.isInteracted };
+                this.parent.trigger('fileSelect', selecEventArgs);
             }
         }
     };
@@ -216,19 +229,25 @@ var NavigationPane = /** @class */ (function () {
         this.parent.itemData = data;
         this.activeNode = node;
         this.parent.activeModule = 'navigationpane';
-        updatePath(node, this.parent.itemData[0], this.parent);
-        read(this.parent, this.isPathDragged ? events.pasteEnd : events.pathChanged, this.parent.path);
-        this.parent.visitedItem = node;
-        this.isPathDragged = this.isRenameParent = this.isRightClick = false;
-        this.treeObj.selectedNodes = [node.getAttribute('data-uid')];
+        var eventArgs = { cancel: false, fileDetails: data[0], module: 'NavigationPane' };
+        this.parent.trigger('fileOpen', eventArgs);
+        this.isNodeClickCalled = true;
+        if (!eventArgs.cancel) {
+            updatePath(node, this.parent.itemData[0], this.parent);
+            read(this.parent, this.isPathDragged ? events.pasteEnd : events.pathChanged, this.parent.path);
+            this.parent.visitedItem = node;
+            this.isPathDragged = this.isRenameParent = this.isRightClick = false;
+            this.treeObj.selectedNodes = [node.getAttribute('data-uid')];
+        }
     };
     NavigationPane.prototype.onNodeSelected = function (args) {
         if (this.parent.breadcrumbbarModule && this.parent.breadcrumbbarModule.searchObj && !this.renameParent) {
             this.parent.breadcrumbbarModule.searchObj.element.value = '';
             this.parent.isFiltered = false;
+            this.isNodeClickCalled = false;
         }
         this.parent.searchedItems = [];
-        if (!args.isInteracted && !this.isRightClick && !this.isPathDragged && !this.isRenameParent) {
+        if (!args.isInteracted && !this.isRightClick && !this.isSameNodeClicked && !this.isPathDragged && !this.isRenameParent) {
             this.parent.pathId = getPathId(args.node);
             return;
         }
@@ -239,7 +258,8 @@ var NavigationPane = /** @class */ (function () {
         this.parent.selectedItems = [];
         this.parent.itemData = nodeData;
         var previousPath = this.parent.path;
-        if (!this.isRightClick) {
+        var sNode = select('[data-uid="' + this.treeObj.selectedNodes[0] + '"]', this.treeObj.element);
+        if (!this.isRightClick && this.isSameNodeClicked && sNode.querySelector('.e-list-text').innerHTML !== this.parent.pathNames[this.parent.pathNames.length - 1]) {
             updatePath(args.node, this.parent.itemData[0], this.parent);
         }
         else {
@@ -251,12 +271,13 @@ var NavigationPane = /** @class */ (function () {
             if (args.node.querySelector('.' + CLS.ICONS) && args.node.querySelector('.' + CLS.LIST_ITEM) === null) {
                 this.expandNodeTarget = 'add';
             }
-            if (!this.isRightClick) {
+            if (!this.isRightClick && this.isSameNodeClicked) {
                 read(this.parent, this.isPathDragged ? events.pasteEnd : events.pathChanged, this.parent.path);
+                this.isNodeClickCalled = true;
             }
             this.parent.visitedItem = args.node;
         }
-        this.isPathDragged = this.isRenameParent = this.isRightClick = false;
+        this.isPathDragged = this.isRenameParent = this.isRightClick = this.isSameNodeClicked = false;
     };
     /* istanbul ignore next */
     // eslint-disable-next-line
@@ -279,12 +300,14 @@ var NavigationPane = /** @class */ (function () {
             this.parent.expandedId = this.expandNodeTarget;
             this.parent.itemData = this.getTreeData(getValue('id', args.nodeData));
             read(this.parent, events.nodeExpand, path);
+            this.isNodeExpandCalled = true;
         }
     };
     /* istanbul ignore next */
     NavigationPane.prototype.onNodeExpanded = function (args) {
         this.addChild(args.files, this.expandNodeTarget, false);
         this.parent.expandedId = null;
+        this.isNodeExpandCalled = false;
     };
     NavigationPane.prototype.onNodeClicked = function (args) {
         this.parent.activeModule = 'navigationpane';
@@ -300,6 +323,14 @@ var NavigationPane = /** @class */ (function () {
             var layout = (this.parent.view === 'LargeIcons') ? 'largeiconsview' : 'detailsview';
             this.parent.notify(events.modelChanged, { module: layout, newProp: { selectedItems: [] } });
         }
+        else if (args.node.getAttribute('data-uid') === this.treeObj.selectedNodes[0] && !this.isNodeClickCalled && !this.isNodeExpandCalled) {
+            if (args.event.which === 3) {
+                this.isRightClick = true;
+            }
+            this.isSameNodeClicked = true;
+            this.isNodeClickCalled = true;
+            this.treeObj.selectedNodes = [args.node.getAttribute('data-uid')];
+        }
     };
     /* istanbul ignore next */
     NavigationPane.prototype.onNodeEditing = function (args) {

package/src/file-manager/pop-up/context-menu.js

@@ -243,10 +243,11 @@ var ContextMenu = /** @class */ (function () {
         this.menuType = 'folder';
         this.contextMenu.items = this.getItemData(this.parent.contextMenuSettings.folder.map(function (item) { return item.trim(); }));
         this.contextMenu.dataBind();
-        if (isTree) {
+        var selectedTreeNode = select('[data-uid="' + this.parent.navigationpaneModule.treeObj.selectedNodes[0] + '"]', this.parent.navigationpaneModule.treeObj.element);
+        if (this.parent.pathNames[this.parent.pathNames.length - 1] === selectedTreeNode.querySelector('.e-list-text').innerHTML && this.parent.activeModule === 'navigationpane') {
             this.disabledItems.push('Open');
         }
-        else if (this.parent.selectedItems.length !== 1) {
+        else if (this.parent.selectedItems.length !== 1 && this.parent.activeModule !== 'navigationpane') {
             this.disabledItems.push('Rename', 'Paste');
         }
     };
@@ -390,10 +391,13 @@ var ContextMenu = /** @class */ (function () {
                         refresh(_this.parent);
                         break;
                     case 'open':
-                        if (_this.parent.visitedItem) {
+                        if (_this.parent.visitedItem && _this.parent.activeModule !== 'navigationpane') {
                             _this.parent.notify(events.openInit, { target: _this.parent.visitedItem });
                         }
                         else if (_this.parent.activeModule === 'navigationpane') {
+                            if (_this.parent.visitedItem) {
+                                _this.parent.notify(events.openInit, { target: _this.parent.visitedItem });
+                            }
                             _this.parent.navigationpaneModule.openFileOnContextMenuClick(closest(_this.targetNodeElement, 'li'));
                         }
                         break;

package/src/file-manager/pop-up/dialog.js

@@ -5,7 +5,7 @@ import { createFolder } from '../common/operations';
 import * as CLS from '../base/classes';
 import * as events from '../base/constant';
 import { paste, rename } from '../common/operations';
-import { getLocaleText, getDuplicateData, getParentPath, objectToString, getCssClass } from '../common/utility';
+import { getLocaleText, getDuplicateData, objectToString, getCssClass } from '../common/utility';
 import { Input } from '@syncfusion/ej2-inputs';
 import { CheckBox } from '@syncfusion/ej2-buttons';
 // eslint:disable-next-line
@@ -840,7 +840,8 @@ function onReSubmit(parent) {
         parent.dialogObj.hide();
         return;
     }
-    var newPath = (parent.activeModule === 'navigationpane') ? getParentPath(parent.path) : parent.path;
+    var newPath = (parent.activeModule === 'navigationpane') ? getValue('filterPath', parent.itemData[0]).replace(/\\/g, '/') : parent.path;
+    parent.renamedId = getValue('id', parent.itemData[0]);
     parent.renamedId = getValue('id', parent.itemData[0]);
     if (parent.isFile) {
         var oldExtension = (oIndex === -1) ? '' : parent.currentItemText.substr(oIndex);