Skip to content

Commit d8551d9

Browse files
authored
Fix simcore.s3 tree loading issue (#947)
Show "Loading" spinner also of simcore.s3
1 parent 0311f2c commit d8551d9

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

services/web/client/source/class/qxapp/component/widget/logger/LoggerView.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ qx.Class.define("qxapp.component.widget.logger.LoggerView", {
7878

7979
this.__createInitMsg();
8080

81-
this.__textfield.addListener("changeValue", this.__applyFilters, this);
81+
this.__textFilterField.addListener("changeValue", this.__applyFilters, this);
8282
},
8383

8484
events: {},
@@ -137,7 +137,7 @@ qx.Class.define("qxapp.component.widget.logger.LoggerView", {
137137

138138
members: {
139139
__currentNodeButton: null,
140-
__textfield: null,
140+
__textFilterField: null,
141141
__logModel: null,
142142
__logView: null,
143143
__messengerColors: null,
@@ -155,12 +155,12 @@ qx.Class.define("qxapp.component.widget.logger.LoggerView", {
155155
toolbar.add(currentNodeButton);
156156

157157
toolbar.add(new qx.ui.toolbar.Separator());
158-
this.__textfield = new qx.ui.form.TextField().set({
158+
const textFilterField = this.__textFilterField = new qx.ui.form.TextField().set({
159159
appearance: "toolbar-textfield",
160160
liveUpdate: true,
161161
placeholder: this.tr("Filter")
162162
});
163-
toolbar.add(this.__textfield, {
163+
toolbar.add(textFilterField, {
164164
flex: 1
165165
});
166166

@@ -239,9 +239,9 @@ qx.Class.define("qxapp.component.widget.logger.LoggerView", {
239239
const workbench = this.getWorkbench();
240240
const node = workbench.getNode(nodeId);
241241
if (node) {
242-
this.__textfield.setValue(node.getLabel());
242+
this.__textFilterField.setValue(node.getLabel());
243243
} else {
244-
this.__textfield.setValue("");
244+
this.__textFilterField.setValue("");
245245
}
246246
},
247247

@@ -321,7 +321,7 @@ qx.Class.define("qxapp.component.widget.logger.LoggerView", {
321321
return;
322322
}
323323

324-
this.__logModel.setFilterString(this.__textfield.getValue());
324+
this.__logModel.setFilterString(this.__textFilterField.getValue());
325325
this.__logModel.setFilterLogLevel(this.getLogLevel());
326326
this.__logModel.reloadData();
327327
},

services/web/client/source/class/qxapp/desktop/StudyEditor.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,15 @@ qx.Class.define("qxapp.desktop.StudyEditor", {
8989
initDefault: function() {
9090
const study = this.getStudy();
9191

92-
const treeView = this.__nodesTree = new qxapp.component.widget.NodesTree(study.getName(), study.getWorkbench());
93-
treeView.addListener("addNode", () => {
92+
const nodesTree = this.__nodesTree = new qxapp.component.widget.NodesTree(study.getName(), study.getWorkbench());
93+
nodesTree.addListener("addNode", () => {
9494
this.__addNode();
9595
}, this);
96-
treeView.addListener("removeNode", e => {
96+
nodesTree.addListener("removeNode", e => {
9797
const nodeId = e.getData();
9898
this.__removeNode(nodeId);
9999
}, this);
100-
this.__sidePanel.addOrReplaceAt(new qxapp.desktop.PanelView(this.tr("Service tree"), treeView), 0);
100+
this.__sidePanel.addOrReplaceAt(new qxapp.desktop.PanelView(this.tr("Service tree"), nodesTree), 0);
101101

102102
const extraView = this.__extraView = new qxapp.component.metadata.StudyInfo(study);
103103
this.__sidePanel.addOrReplaceAt(new qxapp.desktop.PanelView(this.tr("Study information"), extraView), 1);
@@ -176,15 +176,15 @@ qx.Class.define("qxapp.desktop.StudyEditor", {
176176
});
177177

178178
const workbenchUI = this.__workbenchUI;
179-
const treeView = this.__nodesTree;
180-
treeView.addListener("changeSelectedNode", e => {
179+
const nodesTree = this.__nodesTree;
180+
nodesTree.addListener("changeSelectedNode", e => {
181181
const node = workbenchUI.getNodeUI(e.getData());
182182
if (node && node.classname.includes("NodeUI")) {
183183
node.setActive(true);
184184
}
185185
});
186186
workbenchUI.addListener("changeSelectedNode", e => {
187-
treeView.nodeSelected(e.getData());
187+
nodesTree.nodeSelected(e.getData());
188188
});
189189
},
190190

@@ -233,7 +233,7 @@ qx.Class.define("qxapp.desktop.StudyEditor", {
233233
}
234234
}
235235

236-
this.__treeView.nodeSelected(nodeId, openNodeAndParents);
236+
this.__nodesTree.nodeSelected(nodeId, openNodeAndParents);
237237
this.__loggerView.setCurrentNodeId(nodeId);
238238
},
239239

services/web/client/source/class/qxapp/file/FilesTreePopulator.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ qx.Class.define("qxapp.file.FilesTreePopulator", {
9696
},
9797

9898
populateMyLocation: function(locationId = null) {
99-
if (locationId) {
99+
if (locationId !== null) {
100100
const locationModel = this.__getLocationModel(locationId);
101101
if (locationModel) {
102102
locationModel.getChildren().removeAll();

0 commit comments

Comments
 (0)