Skip to content

Commit 288ef49

Browse files
committed
[skip ci] multiselection working
1 parent 44713c9 commit 288ef49

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

services/static-webserver/client/source/class/osparc/dashboard/CardBase.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,11 +469,15 @@ qx.Class.define("osparc.dashboard.CardBase", {
469469
},
470470

471471
__evalSelectedButton: function() {
472-
if (this.isResourceType("study")) {
472+
if (
473+
this.isResourceType("study") ||
474+
this.isResourceType("template") ||
475+
this.isResourceType("service")
476+
) {
473477
const menuButton = this.getChildControl("menu-button");
474478
const tick = this.getChildControl("tick-selected");
475479
const untick = this.getChildControl("tick-unselected");
476-
if (this.isMultiSelectionMode()) {
480+
if (this.isResourceType("study") && this.isMultiSelectionMode()) {
477481
const selected = this.getSelected();
478482
menuButton.setVisibility("excluded");
479483
tick.setVisibility(selected ? "visible" : "excluded");

services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -649,23 +649,21 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
649649
return;
650650
}
651651

652-
const studiesCont = this._resourcesContainer.getFlatList();
653-
654-
if (isShiftPressed) {
655-
const lastIdx = studiesCont.getLastSelectedIndex();
656-
const currentIdx = studiesCont.getIndex(item);
657-
const minMax = [Math.min(lastIdx, currentIdx), Math.max(lastIdx, currentIdx)];
658-
for (let i=minMax[0]; i<=minMax[1]; i++) {
659-
const card = studiesCont.getChildren()[i];
660-
if (card.isVisible()) {
661-
card.setSelected(true);
662-
}
663-
}
664-
}
665-
studiesCont.setLastSelectedIndex(studiesCont.getIndex(item));
666-
667652
if (item.isMultiSelectionMode()) {
668653
item.setSelected(!item.getSelected());
654+
const studiesCont = this._resourcesContainer.getFlatList();
655+
if (isShiftPressed) {
656+
const lastIdx = studiesCont.getLastSelectedIndex();
657+
const currentIdx = studiesCont.getIndex(item);
658+
const minMax = [Math.min(lastIdx, currentIdx), Math.max(lastIdx, currentIdx)];
659+
for (let i=minMax[0]; i<=minMax[1]; i++) {
660+
const card = studiesCont.getChildren()[i];
661+
if (card.isVisible()) {
662+
card.setSelected(true);
663+
}
664+
}
665+
}
666+
studiesCont.setLastSelectedIndex(studiesCont.getIndex(item));
669667
} else {
670668
const studyData = this.__getStudyData(item.getUuid(), false);
671669
this._openResourceDetails(studyData);

0 commit comments

Comments
 (0)