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=b30193ad86327b0211bf94af63f020c580319bc6;hp=30352a50a7792fab2a4db2961aca0d0452acbddc;hb=266adb435d7a60ae758efb28614c80d24c05fbba;hpb=7a485f58714f7271c9e06782aea598fb4545025f diff --git a/skyquake/plugins/composer/src/src/stores/ComposerAppStore.js b/skyquake/plugins/composer/src/src/stores/ComposerAppStore.js index 30352a50a..b30193ad8 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 @@ -465,18 +465,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 = { @@ -548,7 +557,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 = []; @@ -624,7 +633,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);