X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fplugins%2Fcomposer%2Fsrc%2Fsrc%2Fstores%2FComposerAppStore.js;fp=skyquake%2Fplugins%2Fcomposer%2Fsrc%2Fsrc%2Fstores%2FComposerAppStore.js;h=3671890b5a060d285eb74841badc22ecb7386c26;hb=64b803dbd876e15a0a2d4ca46d8ce81ac18915f6;hp=854864b7c1a9cb4d6a67b294b742a5d3623ff935;hpb=d51304f9dfd018d778ed2f52fc3c4651c5bbe416;p=osm%2FUI.git diff --git a/skyquake/plugins/composer/src/src/stores/ComposerAppStore.js b/skyquake/plugins/composer/src/src/stores/ComposerAppStore.js index 854864b7c..3671890b5 100644 --- a/skyquake/plugins/composer/src/src/stores/ComposerAppStore.js +++ b/skyquake/plugins/composer/src/src/stores/ComposerAppStore.js @@ -122,7 +122,7 @@ class ComposerAppStore { this.fullScreenMode = false; this.panelTabShown = 'descriptor'; //File manager values - this.files = []; + this.files = false; this.filesState = {}; this.downloadJobs = {}; //End File manager values @@ -457,18 +457,27 @@ class ComposerAppStore { let self = this; let filesState = null; if (self.fileMonitoringSocketID) { - filesState = addInputState( _.cloneDeep(this.filesState),data); - // filesState = _.merge(self.filesState, addInputState({},data)); - let normalizedData = normalizeTree(data); - this.setState({ - files: { - data: _.mergeWith(normalizedData.data, self.files.data, function(obj, src) { - return _.uniqBy(obj? obj.concat(src) : src, 'name'); - }), - id: self.files.id || normalizedData.id - }, - filesState: filesState - }); + let newState = {}; + if(data.hasOwnProperty('contents')) { + filesState = addInputState( _.cloneDeep(this.filesState),data); + // filesState = _.merge(self.filesState, addInputState({},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'); + }), + id: self.files.id || normalizedData.id + }, + filesState: filesState + } + } else { + newState = { + files: false + } + } + + this.setState(newState); } function normalizeTree(data) { let f = { @@ -540,7 +549,7 @@ class ComposerAppStore { let self = this; let ws = window.multiplexer.channel(id); let downloadJobs = _.cloneDeep(self.downloadJobs); - let newFiles = {}; + let newFiles = false; ws.onmessage = (socket) => { if (self.files && self.files.length > 0) { let jobs = []; @@ -616,7 +625,6 @@ class ComposerAppStore { openFileManagerSockets(i) { let self = this; let item = i || self.item; - this.files = {data:[]}; // this.closeFileManagerSockets(); this.getInstance().openFileMonitoringSocket(item.id, item.uiState.type).then(function() { // // self.getInstance().openDownloadMonitoringSocket(item.id);