Skip to content

Commit 949a886

Browse files
committed
enable features
1 parent bc54827 commit 949a886

File tree

10 files changed

+28
-74
lines changed

10 files changed

+28
-74
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,10 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
160160

161161
__addItems: function() {
162162
this.__addUIConfigItems();
163-
if (osparc.store.StaticInfo.getInstance().isDevFeaturesEnabled()) {
164-
if (osparc.product.Utils.isS4LProduct()) {
165-
this.__addHypertools();
166-
}
167-
this.__addOtherTabsAccess();
163+
if (osparc.product.Utils.isS4LProduct()) {
164+
this.__addHypertools();
168165
}
166+
this.__addOtherTabsAccess();
169167
this.getChildControl("new-folder");
170168
},
171169

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1516,10 +1516,8 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
15161516
const duplicateStudyButton = this.__getDuplicateMenuButton(studyData);
15171517
menu.add(duplicateStudyButton);
15181518

1519-
if (osparc.product.Utils.hasConvertToPipelineEnabled()) {
1520-
const convertToPipelineButton = this.__getConvertToPipelineMenuButton(studyData);
1521-
menu.add(convertToPipelineButton);
1522-
}
1519+
const convertToPipelineButton = this.__getConvertToPipelineMenuButton(studyData);
1520+
menu.add(convertToPipelineButton);
15231521

15241522
if (osparc.product.Utils.hasExportCMisEnabled()) {
15251523
const exportStudyButton = this.__getExportCMisMenuButton(studyData);

services/static-webserver/client/source/class/osparc/desktop/MainPage.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,7 @@ qx.Class.define("osparc.desktop.MainPage", {
6969
preloadPromises.push(osparc.store.Tags.getInstance().fetchTags());
7070
preloadPromises.push(osparc.store.Products.getInstance().fetchUiConfig());
7171
preloadPromises.push(osparc.store.PollTasks.getInstance().fetchTasks());
72-
if (osparc.utils.DisabledPlugins.isJobsEnabled()) {
73-
preloadPromises.push(osparc.store.Jobs.getInstance().fetchJobs());
74-
}
72+
preloadPromises.push(osparc.store.Jobs.getInstance().fetchJobs());
7573
Promise.all(preloadPromises)
7674
.then(() => {
7775
const mainStack = this.__createMainStack();

services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -438,18 +438,16 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
438438

439439
this.__addTopBarSpacer(topBar);
440440

441-
if (osparc.utils.DisabledPlugins.isConversationEnabled()) {
442-
const commentsButton = new qx.ui.form.Button().set({
443-
appearance: "form-button-outlined",
444-
toolTipText: this.tr("Conversations"),
445-
icon: "@FontAwesome5Solid/comments/16",
446-
marginRight: 10,
447-
marginTop: 7,
448-
...osparc.navigation.NavigationBar.BUTTON_OPTIONS
449-
});
450-
commentsButton.addListener("execute", () => osparc.study.Conversations.popUpInWindow(study.serialize()));
451-
topBar.add(commentsButton);
452-
}
441+
const commentsButton = new qx.ui.form.Button().set({
442+
appearance: "form-button-outlined",
443+
toolTipText: this.tr("Conversations"),
444+
icon: "@FontAwesome5Solid/comments/16",
445+
marginRight: 10,
446+
marginTop: 7,
447+
...osparc.navigation.NavigationBar.BUTTON_OPTIONS
448+
});
449+
commentsButton.addListener("execute", () => osparc.study.Conversations.popUpInWindow(study.serialize()));
450+
topBar.add(commentsButton);
453451

454452
const startAppButtonTB = this.__startAppButtonTB = new qx.ui.form.Button().set({
455453
appearance: "form-button-outlined",

services/static-webserver/client/source/class/osparc/navigation/StudyTitleWOptions.js

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,8 @@ qx.Class.define("osparc.navigation.StudyTitleWOptions", {
110110
optionsMenu.setAppearance("menu-wider");
111111
optionsMenu.add(this.getChildControl("study-menu-info"));
112112
optionsMenu.add(this.getChildControl("study-menu-reload"));
113-
if (osparc.utils.DisabledPlugins.isConversationEnabled()) {
114-
optionsMenu.add(this.getChildControl("study-menu-conversations"));
115-
}
116-
if (osparc.product.Utils.hasConvertToPipelineEnabled()) {
117-
optionsMenu.add(this.getChildControl("study-menu-convert-to-pipeline"));
118-
}
113+
optionsMenu.add(this.getChildControl("study-menu-conversations"));
114+
optionsMenu.add(this.getChildControl("study-menu-convert-to-pipeline"));
119115
optionsMenu.add(this.getChildControl("study-menu-restore"));
120116
optionsMenu.add(this.getChildControl("study-menu-open-logger"));
121117
control = new qx.ui.form.MenuButton().set({
@@ -161,19 +157,15 @@ qx.Class.define("osparc.navigation.StudyTitleWOptions", {
161157
converter: mode => mode === "standalone" ? "visible" : "excluded"
162158
});
163159

164-
if (osparc.utils.DisabledPlugins.isConversationEnabled()) {
165-
const conversationsButton = this.getChildControl("study-menu-conversations");
166-
study.getUi().bind("mode", conversationsButton, "visibility", {
167-
converter: mode => mode === "standalone" ? "visible" : "excluded"
168-
});
169-
}
160+
const conversationsButton = this.getChildControl("study-menu-conversations");
161+
study.getUi().bind("mode", conversationsButton, "visibility", {
162+
converter: mode => mode === "standalone" ? "visible" : "excluded"
163+
});
170164

171-
if (osparc.product.Utils.hasConvertToPipelineEnabled()) {
172-
const convertToPipelineButton = this.getChildControl("study-menu-convert-to-pipeline");
173-
study.getUi().bind("mode", convertToPipelineButton, "visibility", {
174-
converter: mode => mode === "standalone" ? "visible" : "excluded"
175-
});
176-
}
165+
const convertToPipelineButton = this.getChildControl("study-menu-convert-to-pipeline");
166+
study.getUi().bind("mode", convertToPipelineButton, "visibility", {
167+
converter: mode => mode === "standalone" ? "visible" : "excluded"
168+
});
177169

178170
const restoreButton = this.getChildControl("study-menu-restore");
179171
study.getUi().bind("mode", restoreButton, "visibility", {

services/static-webserver/client/source/class/osparc/product/Utils.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,6 @@ qx.Class.define("osparc.product.Utils", {
222222
return "REGISTER";
223223
},
224224

225-
hasConvertToPipelineEnabled: function() {
226-
return osparc.store.StaticInfo.getInstance().isDevFeaturesEnabled();
227-
},
228-
229225
// oSPARC only
230226
hasExportCMisEnabled: function() {
231227
const product = this.getProductName();

services/static-webserver/client/source/class/osparc/share/NewCollaboratorsManager.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ qx.Class.define("osparc.share.NewCollaboratorsManager", {
3434
this.__potentialCollaborators = {};
3535
this.__reloadPotentialCollaborators();
3636

37-
this.__shareWithEmailEnabled = false;
38-
if (this.__resourceData["resourceType"] === "study") {
39-
this.__shareWithEmailEnabled = osparc.utils.DisabledPlugins.isShareWithEmailEnabled();
40-
}
37+
this.__shareWithEmailEnabled = this.__resourceData["resourceType"] === "study";
4138

4239
if (preselectCollaboratorGids && preselectCollaboratorGids.length) {
4340
preselectCollaboratorGids.forEach(preselectCollaboratorGid => {

services/static-webserver/client/source/class/osparc/study/SaveAsTemplate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ qx.Class.define("osparc.study.SaveAsTemplate", {
5656
});
5757
form.add(publishWithData, this.tr("Publish with data"), null, "publishWithData");
5858

59-
if (osparc.utils.DisabledPlugins.isHypertoolsEnabled()) {
59+
if (osparc.product.Utils.isS4LProduct()) {
6060
const templateTypeSB = new qx.ui.form.SelectBox().set({
6161
allowGrowX: false,
6262
});

services/static-webserver/client/source/class/osparc/study/Utils.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,6 @@ qx.Class.define("osparc.study.Utils", {
258258
},
259259

260260
canCreateFunction: function(workbench) {
261-
if (!osparc.store.StaticInfo.getInstance().isDevFeaturesEnabled()) {
262-
return false;
263-
}
264-
265261
// in order to create a function, the pipeline needs:
266262
// - at least one parameter (or file-picker (file type parameter))
267263
// - at least one probe

services/static-webserver/client/source/class/osparc/utils/DisabledPlugins.js

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,25 +52,6 @@ qx.Class.define("osparc.utils.DisabledPlugins", {
5252
return this.__isPluginDisabled(this.LICENSES);
5353
},
5454

55-
isShareWithEmailEnabled: function() {
56-
return osparc.store.StaticInfo.getInstance().isDevFeaturesEnabled();
57-
},
58-
59-
isJobsEnabled: function() {
60-
return osparc.store.StaticInfo.getInstance().isDevFeaturesEnabled();
61-
},
62-
63-
isHypertoolsEnabled: function() {
64-
if (osparc.store.StaticInfo.getInstance().isDevFeaturesEnabled() && osparc.product.Utils.isS4LProduct()) {
65-
return true;
66-
}
67-
return false;
68-
},
69-
70-
isConversationEnabled: function() {
71-
return osparc.store.StaticInfo.getInstance().isDevFeaturesEnabled();
72-
},
73-
7455
__isPluginDisabled: function(key) {
7556
const statics = osparc.store.Store.getInstance().get("statics");
7657
if (statics) {

0 commit comments

Comments
 (0)