X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fplugins%2Fcomposer%2Fsrc%2Fsrc%2Fcomponents%2Ffilemanager%2FFileManager.jsx;h=913f71ac64f03e7e23388f0e8d7a3e34e354fd32;hp=3833ab4515781667c2721eaa8ff2c5c040430a6c;hb=8062ddd9cb3206399b4f88916bccd9e3fa2104c5;hpb=756a58911e5ab70e42b7793ffef9807738d2f5e1 diff --git a/skyquake/plugins/composer/src/src/components/filemanager/FileManager.jsx b/skyquake/plugins/composer/src/src/components/filemanager/FileManager.jsx index 3833ab451..913f71ac6 100644 --- a/skyquake/plugins/composer/src/src/components/filemanager/FileManager.jsx +++ b/skyquake/plugins/composer/src/src/components/filemanager/FileManager.jsx @@ -18,7 +18,8 @@ //https://raw.githubusercontent.com/RIFTIO/RIFT.ware/master/rift-shell -import _ from 'lodash' +import _cloneDeep from 'lodash/cloneDeep' +import _findIndex from 'lodash/findIndex' import React from 'react'; import ReactDOM from 'react-dom'; import TreeView from 'react-treeview'; @@ -83,11 +84,11 @@ class FileManager extends React.Component { let splitUrl = url.split('/'); let fileName = splitUrl[splitUrl.length - 1]; folder.pop; - let fullPath = _.cloneDeep(folder); + let fullPath = _cloneDeep(folder); fullPath.push(fileName); fullPath = fullPath.join('/'); folder = folder.join('/'); - let fileIndex = _.findIndex(files[folder], function(f) { + let fileIndex = _findIndex(files[folder], function(f) { return f.name == fullPath; }) if (fileIndex == -1) { @@ -131,7 +132,8 @@ function buildList(self, data) { function contentFolder(context, folder, path, key, inputState, updateFn, sendDownloadFileRequst, deleteFn) { let type = context.props.type; let id = context.props.item.id; - const onboardDropZone = createDropZone.bind(this, FileManagerUploadDropZone.ACTIONS.onboard, '.ComposerAppAddFile.' + path.replace(/\//g, '-'), type, id, path); + let classId = `DZ-${path.replace(/\//g, '-')}`; + const onboardDropZone = createDropZone.bind(this, FileManagerUploadDropZone.ACTIONS.onboard, '.ComposerAppAddFile.' + classId, type, id, path); return (
@@ -169,11 +171,12 @@ class ItemUpload extends React.Component { } render() { let {type, id, path, key, ...props} = this.props; + let classId = `DZ-${path.replace(/\//g, '-')}`; return (
)