X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fplugins%2Fcomposer%2Fsrc%2Fsrc%2Fstores%2FComposerAppStore.js;h=c677a44a699ca88952bff81d01bf60f34bc26c9a;hp=75276d22aa858532900d33a85f846b4d400e4d58;hb=efb2d7e8df66f52c5e26c575197fc92da2b3e99a;hpb=ab1296ba58f614eaf228c718e171d7dd59e76388 diff --git a/skyquake/plugins/composer/src/src/stores/ComposerAppStore.js b/skyquake/plugins/composer/src/src/stores/ComposerAppStore.js index 75276d22a..c677a44a6 100644 --- a/skyquake/plugins/composer/src/src/stores/ComposerAppStore.js +++ b/skyquake/plugins/composer/src/src/stores/ComposerAppStore.js @@ -18,7 +18,14 @@ */ 'use strict'; -import _ from 'lodash' +import _isNumber from 'lodash/isNumber' +import _cloneDeep from 'lodash/cloneDeep' +import _isEmpty from 'lodash/isEmpty' +import _mergeWith from 'lodash/mergeWith' +import _uniqBy from 'lodash/uniqBy' +import _isEqual from 'lodash/isEqual' +import _findIndex from 'lodash/findIndex' +import _remove from 'lodash/remove' import d3 from 'd3' import alt from '../alt' import UID from '../libraries/UniqueId' @@ -41,6 +48,9 @@ import React from 'react'; //Hack for crouton fix. Should eventually put composer in skyquake alt context import SkyquakeComponent from 'widgets/skyquake_container/skyquakeComponent.jsx'; let NotificationError = null; + +import utils from '../libraries/utils'; + class ComponentBridge extends React.Component { constructor(props) { super(props); @@ -53,7 +63,7 @@ class ComponentBridge extends React.Component { const getDefault = (name, defaultValue) => { const val = window.localStorage.getItem('defaults-' + name); if (val) { - if (_.isNumber(val)) { + if (_isNumber(val)) { if (val < 0) { return setDefault(name, 0); } @@ -126,6 +136,7 @@ class ComposerAppStore { this.filesState = {}; this.downloadJobs = {}; this.containers = []; + this.newPathName = ''; //End File manager values this.bindListeners({ onResize: PanelResizeAction.RESIZE, @@ -161,10 +172,13 @@ class ComposerAppStore { addFileSuccess: FileManagerActions.addFileSuccess, deletePackageFile: FileManagerActions.deletePackageFile, deleteFileSuccess: FileManagerActions.deleteFileSuccess, + deleteFileError: FileManagerActions.deleteFileError, closeFileManagerSockets: FileManagerActions.closeFileManagerSockets, openFileManagerSockets: FileManagerActions.openFileManagerSockets, openDownloadMonitoringSocketSuccess: FileManagerActions.openDownloadMonitoringSocketSuccess, - getFilelistSocketSuccess: FileManagerActions.getFilelistSocketSuccess + getFilelistSocketSuccess: FileManagerActions.getFilelistSocketSuccess, + newPathNameUpdated: FileManagerActions.newPathNameUpdated, + createDirectory: FileManagerActions.createDirectory }); this.exportPublicMethods({ closeFileManagerSockets: this.closeFileManagerSockets.bind(this) @@ -212,7 +226,7 @@ class ComposerAppStore { d.cpNumber = ++cpNumber; containers.filter(d => DescriptorModelFactory.isVnfdConnectionPointRef(d)).filter(ref => ref.key === d.key).forEach(ref => ref.cpNumber = d.cpNumber); }); - this.setState({containers: containers, item: _.cloneDeep(item)}); + this.setState({containers: containers, item: _cloneDeep(item)}); } SelectionManager.refreshOutline(); } @@ -228,7 +242,9 @@ class ComposerAppStore { } SelectionManager.select(item); this.updateItem(item); - this.openFileManagerSockets(item) + if (item) { + this.openFileManagerSockets(item); + } } catalogItemMetaDataChanged(item) { this.updateItem(item); @@ -261,7 +277,7 @@ class ComposerAppStore { applyDefaultLayout() { if (this.item && this.item.uiState && this.item.uiState.containerPositionMap) { - if (!_.isEmpty(this.item.uiState.containerPositionMap)) { + if (!_isEmpty(this.item.uiState.containerPositionMap)) { this.item.uiState.containerPositionMap = {}; CatalogItemsActions.catalogItemMetaDataChanged.defer(this.item); } @@ -404,7 +420,7 @@ class ComposerAppStore { if (isFullScreen()) { const layout = comp.layout; - const restoreLayout = _.cloneDeep(layout); + const restoreLayout = _cloneDeep(layout); uiTransientState.restoreLayout = restoreLayout; layout.left = 0; layout.right = 0; @@ -469,15 +485,14 @@ class ComposerAppStore { if (self.fileMonitoringSocketID) { let newState = {}; if(data.hasOwnProperty('contents')) { - filesState = addInputState( _.cloneDeep(this.filesState),data); - // filesState = _.merge(self.filesState, addInputState({},data)); + filesState = addInputState( _cloneDeep(this.filesState),data); let normalizedData = normalizeTree(data); newState = { files: { - data: _.mergeWith(normalizedData.data, self.files.data, function(obj, src) { - return _.uniqBy(obj? obj.concat(src) : src, 'name'); + data: _mergeWith(normalizedData.data, self.files.data, function(obj, src) { + return _uniqBy(obj? obj.concat(src) : src, 'name'); }), - id: self.files.id || normalizedData.id + id: normalizedData.id }, filesState: filesState } @@ -486,8 +501,10 @@ class ComposerAppStore { files: false } } + if(!_isEqual(newState.files, this.files) || ! _isEqual(newState.fileState, this.fileState)) { + this.setState(newState); + } - this.setState(newState); } function normalizeTree(data) { let f = { @@ -527,26 +544,28 @@ class ComposerAppStore { let type = data.type || this.item.uiState.type; let path = data.path; let url = data.url; - this.getInstance().addFile(id, type, path, url); + this.getInstance().addFile(id, type, path, url, data.refresh); } updateFileLocationInput = (data) => { let name = data.name; let value = data.value; - var filesState = _.cloneDeep(this.filesState); + var filesState = _cloneDeep(this.filesState); filesState[name] = value; this.setState({ filesState: filesState }); } addFileSuccess = (data) => { - let path = data.path; - let fileName = data.fileName; - let files = _.cloneDeep(this.files); - let loadingIndex = files.data[path].push({ - status: 'DOWNLOADING', - name: path + '/' + fileName - }) - 1; - this.setState({files: files}); + if(!data.refresh) { + let path = data.path; + let fileName = data.fileName; + let files = _cloneDeep(this.files); + let loadingIndex = files.data[path].push({ + status: 'DOWNLOADING', + name: path + '/' + fileName + }) - 1; + this.setState({files: files}); + } } startWatchingJob = () => { @@ -558,7 +577,7 @@ class ComposerAppStore { openDownloadMonitoringSocketSuccess = (id) => { let self = this; let ws = window.multiplexer.channel(id); - let downloadJobs = _.cloneDeep(self.downloadJobs); + let downloadJobs = _cloneDeep(self.downloadJobs); let newFiles = false; ws.onmessage = (socket) => { if (self.files && self.files.length > 0) { @@ -566,14 +585,14 @@ class ComposerAppStore { try { jobs = JSON.parse(socket.data); } catch(e) {} - newFiles = _.cloneDeep(self.files); + newFiles = _cloneDeep(self.files); jobs.map(function(j) { //check if not in completed state let fullPath = j['package-path']; let path = fullPath.split('/'); let fileName = path.pop(); path = path.join('/'); - let index = _.findIndex(self.files.data[path], function(o){ + let index = _findIndex(self.files.data[path], function(o){ return fullPath == o.name }); if((index > -1) && newFiles.data[path][index]) { @@ -651,11 +670,11 @@ class ComposerAppStore { } deleteFileSuccess = (data) => { let path = data.path.split('/') - let files = _.cloneDeep(this.files); + let files = _cloneDeep(this.files); path.pop(); path = path.join('/'); let pathFiles = files.data[path] - _.remove(pathFiles, function(c) { + _remove(pathFiles, function(c) { return c.name == data.path; }); @@ -663,6 +682,34 @@ class ComposerAppStore { files: files }) } + deleteFileError = (error) => { + const filepath = error.path; + const message = error.data && error.data.output ? ' (' + error.data.output['error-trace'] + ')' : ' (server error)'; + console.log('Unable to delete', filepath, 'Error:', message); + ComposerAppActions.showError.defer({ + errorMessage: 'Unable to delete ' + filepath + message + '. ' + }); + } + + newPathNameUpdated = (event) => { + const value = event.target.value; + this.setState({ + newPathName: value + }) + } + createDirectory = () => { + console.log(this.newPathName); + this.sendDownloadFileRequst({ + id: this.item.id, + type: this.item.uiState.type, + path: this.item.name + '/' + this.newPathName, + url: utils.getSearchParams(window.location).dev_download_server || window.location.protocol + '//' + window.location.host, + refresh: true + }); + this.setState({ + newPathName: '' + }) + } } export default alt.createStore(ComposerAppStore, 'ComposerAppStore');