From 8af62fbbae3834b43aaaf21242a87d61c2cc80cb Mon Sep 17 00:00:00 2001 From: Odei Maiz Date: Mon, 23 Sep 2024 10:53:43 +0200 Subject: [PATCH 1/8] move button to user menu --- .../class/osparc/navigation/NavigationBar.js | 12 ---------- .../class/osparc/navigation/UserMenu.js | 24 ++++++++++++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js b/services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js index 4353cd497f0d..da98f12bc74f 100644 --- a/services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js +++ b/services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js @@ -133,9 +133,6 @@ qx.Class.define("osparc.navigation.NavigationBar", { this.getChildControl("read-only-info"); // right-items - if (osparc.product.Utils.isProduct("tiplite")) { - this.getChildControl("tip-lite-button"); - } this.getChildControl("tasks-button"); this.getChildControl("notifications-button"); this.getChildControl("expiration-icon"); @@ -231,15 +228,6 @@ qx.Class.define("osparc.navigation.NavigationBar", { this.getChildControl("center-items").add(control); break; } - case "tip-lite-button": - control = new qx.ui.form.Button(this.tr("Access TIP")).set({ - marginRight: 30, - ...this.self().BUTTON_OPTIONS, - }); - osparc.utils.Utils.setIdToWidget(control, "accessTIPBtn"); - control.addListener("execute", () => osparc.product.TIPTeaser.getInstance().open()); - this.getChildControl("right-items").add(control); - break; case "credits-button": control = new osparc.desktop.credits.CreditsIndicatorButton(); this.getChildControl("right-items").add(control); diff --git a/services/static-webserver/client/source/class/osparc/navigation/UserMenu.js b/services/static-webserver/client/source/class/osparc/navigation/UserMenu.js index b226a949ae3f..fee0608bb59f 100644 --- a/services/static-webserver/client/source/class/osparc/navigation/UserMenu.js +++ b/services/static-webserver/client/source/class/osparc/navigation/UserMenu.js @@ -95,12 +95,6 @@ qx.Class.define("osparc.navigation.UserMenu", { control.addListener("execute", () => osparc.cluster.Utils.popUpClustersDetails(), this); this.add(control); break; - case "license": - control = new qx.ui.menu.Button(this.tr("License")); - osparc.store.Support.getLicenseURL() - .then(licenseURL => control.addListener("execute", () => window.open(licenseURL))); - this.add(control); - break; case "about": control = new qx.ui.menu.Button(this.tr("About oSPARC")); control.addListener("execute", () => osparc.About.getInstance().open()); @@ -116,6 +110,18 @@ qx.Class.define("osparc.navigation.UserMenu", { this.add(control); break; } + case "license": + control = new qx.ui.menu.Button(this.tr("License")); + osparc.store.Support.getLicenseURL() + .then(licenseURL => control.addListener("execute", () => window.open(licenseURL))); + this.add(control); + break; + case "tip-lite-button": + control = new qx.ui.menu.Button(this.tr("Access full TIP")); + osparc.utils.Utils.setIdToWidget(control, "userMenuAccessTIPBtn"); + control.addListener("execute", () => osparc.product.TIPTeaser.getInstance().open()); + this.getChildControl("right-items").add(control); + break; case "log-out": { const authData = osparc.auth.Data.getInstance(); control = new qx.ui.menu.Button(authData.isGuest() ? this.tr("Exit") : this.tr("Log out")); @@ -167,6 +173,9 @@ qx.Class.define("osparc.navigation.UserMenu", { this.getChildControl("about-product"); } this.getChildControl("license"); + if (osparc.product.Utils.isProduct("tiplite")) { + this.getChildControl("tip-lite-button"); + } this.addSeparator(); this.getChildControl("log-out"); @@ -220,6 +229,9 @@ qx.Class.define("osparc.navigation.UserMenu", { this.getChildControl("about-product"); } this.getChildControl("license"); + if (osparc.product.Utils.isProduct("tiplite")) { + this.getChildControl("tip-lite-button"); + } this.addSeparator(); this.getChildControl("log-out"); From 1ef4914b88b510d4c3486a89cfea0f9d4f8f3d6b Mon Sep 17 00:00:00 2001 From: Odei Maiz Date: Mon, 23 Sep 2024 11:02:50 +0200 Subject: [PATCH 2/8] minor --- .../client/source/class/osparc/navigation/NavigationBar.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js b/services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js index da98f12bc74f..9fd0605bb168 100644 --- a/services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js +++ b/services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js @@ -183,6 +183,12 @@ qx.Class.define("osparc.navigation.NavigationBar", { width: osparc.product.Utils.isS4LProduct() ? 150 : 100, height: osparc.navigation.NavigationBar.HEIGHT }); + if (osparc.product.Utils.isProduct("tiplite")) { + control.set({ + toolTipText: this.tr("This is TIP lite, a light version of TIP.
Request access to TIP.") + }); + control.addListener("tap", () => osparc.product.TIPTeaser.getInstance().open()); + } this.getChildControl("left-items").add(control); break; case "logo-powered": From 2e0268063a76da56e6c138aaed43d640018f976e Mon Sep 17 00:00:00 2001 From: Odei Maiz Date: Mon, 23 Sep 2024 11:04:37 +0200 Subject: [PATCH 3/8] fix --- .../client/source/class/osparc/navigation/UserMenu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/static-webserver/client/source/class/osparc/navigation/UserMenu.js b/services/static-webserver/client/source/class/osparc/navigation/UserMenu.js index fee0608bb59f..c8e54e780645 100644 --- a/services/static-webserver/client/source/class/osparc/navigation/UserMenu.js +++ b/services/static-webserver/client/source/class/osparc/navigation/UserMenu.js @@ -120,7 +120,7 @@ qx.Class.define("osparc.navigation.UserMenu", { control = new qx.ui.menu.Button(this.tr("Access full TIP")); osparc.utils.Utils.setIdToWidget(control, "userMenuAccessTIPBtn"); control.addListener("execute", () => osparc.product.TIPTeaser.getInstance().open()); - this.getChildControl("right-items").add(control); + this.add(control); break; case "log-out": { const authData = osparc.auth.Data.getInstance(); From 546bae179eec4a58069949224ede6ddf6de7ea19 Mon Sep 17 00:00:00 2001 From: Odei Maiz Date: Mon, 23 Sep 2024 11:04:45 +0200 Subject: [PATCH 4/8] Full --- .../client/source/class/osparc/product/TIPTeaser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/static-webserver/client/source/class/osparc/product/TIPTeaser.js b/services/static-webserver/client/source/class/osparc/product/TIPTeaser.js index aac97d48eebf..d71ac819f3bb 100644 --- a/services/static-webserver/client/source/class/osparc/product/TIPTeaser.js +++ b/services/static-webserver/client/source/class/osparc/product/TIPTeaser.js @@ -20,7 +20,7 @@ qx.Class.define("osparc.product.TIPTeaser", { type: "singleton", construct: function() { - this.base(arguments, this.tr("Access TIP")); + this.base(arguments, this.tr("Access Full TIP")); this.set({ layout: new qx.ui.layout.VBox(10), From 087a0197d23ad7e0adeec0430ede5bc7d2d9d9a0 Mon Sep 17 00:00:00 2001 From: Odei Maiz Date: Mon, 23 Sep 2024 11:04:52 +0200 Subject: [PATCH 5/8] minor --- .../client/source/class/osparc/navigation/NavigationBar.js | 1 + 1 file changed, 1 insertion(+) diff --git a/services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js b/services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js index 9fd0605bb168..f676b0782839 100644 --- a/services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js +++ b/services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js @@ -185,6 +185,7 @@ qx.Class.define("osparc.navigation.NavigationBar", { }); if (osparc.product.Utils.isProduct("tiplite")) { control.set({ + cursor: "pointer", toolTipText: this.tr("This is TIP lite, a light version of TIP.
Request access to TIP.") }); control.addListener("tap", () => osparc.product.TIPTeaser.getInstance().open()); From 72c4252e130bd67293137dd50d5199d0679617ad Mon Sep 17 00:00:00 2001 From: Odei Maiz Date: Mon, 23 Sep 2024 11:09:16 +0200 Subject: [PATCH 6/8] Full --- .../client/source/class/osparc/dashboard/StudyBrowser.js | 3 +-- .../client/source/class/osparc/navigation/UserMenu.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js index 97c5638abd26..1a8bdb79f1d9 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js @@ -794,8 +794,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { if (product in newStudiesData) { const mode = this._resourcesContainer.getMode(); const title = this.tr("New Plan"); - const desc = this.tr("Choose Plan in pop-up"); - const newStudyBtn = (mode === "grid") ? new osparc.dashboard.GridButtonNew(title, desc) : new osparc.dashboard.ListButtonNew(title, desc); + const newStudyBtn = (mode === "grid") ? new osparc.dashboard.GridButtonNew(title) : new osparc.dashboard.ListButtonNew(title, desc); newStudyBtn.setCardKey("new-study"); newStudyBtn.subscribeToFilterGroup("searchBarFilter"); osparc.utils.Utils.setIdToWidget(newStudyBtn, "newStudyBtn"); diff --git a/services/static-webserver/client/source/class/osparc/navigation/UserMenu.js b/services/static-webserver/client/source/class/osparc/navigation/UserMenu.js index c8e54e780645..3c92dae06594 100644 --- a/services/static-webserver/client/source/class/osparc/navigation/UserMenu.js +++ b/services/static-webserver/client/source/class/osparc/navigation/UserMenu.js @@ -117,7 +117,7 @@ qx.Class.define("osparc.navigation.UserMenu", { this.add(control); break; case "tip-lite-button": - control = new qx.ui.menu.Button(this.tr("Access full TIP")); + control = new qx.ui.menu.Button(this.tr("Access Full TIP")); osparc.utils.Utils.setIdToWidget(control, "userMenuAccessTIPBtn"); control.addListener("execute", () => osparc.product.TIPTeaser.getInstance().open()); this.add(control); From 8a64a518aed4c48208fd0c751427fe1c13a372f3 Mon Sep 17 00:00:00 2001 From: Odei Maiz Date: Mon, 23 Sep 2024 11:09:50 +0200 Subject: [PATCH 7/8] linting --- .../client/source/class/osparc/dashboard/StudyBrowser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js index 1a8bdb79f1d9..e67022569343 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js @@ -794,7 +794,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { if (product in newStudiesData) { const mode = this._resourcesContainer.getMode(); const title = this.tr("New Plan"); - const newStudyBtn = (mode === "grid") ? new osparc.dashboard.GridButtonNew(title) : new osparc.dashboard.ListButtonNew(title, desc); + const newStudyBtn = (mode === "grid") ? new osparc.dashboard.GridButtonNew(title) : new osparc.dashboard.ListButtonNew(title); newStudyBtn.setCardKey("new-study"); newStudyBtn.subscribeToFilterGroup("searchBarFilter"); osparc.utils.Utils.setIdToWidget(newStudyBtn, "newStudyBtn"); From 3d56653b4fbdac9041290a02438872ea4841f2b0 Mon Sep 17 00:00:00 2001 From: Odei Maiz Date: Mon, 23 Sep 2024 11:23:24 +0200 Subject: [PATCH 8/8] TIP.lite --- .../client/source/class/osparc/navigation/NavigationBar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js b/services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js index f676b0782839..f926f95b6e03 100644 --- a/services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js +++ b/services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js @@ -186,7 +186,7 @@ qx.Class.define("osparc.navigation.NavigationBar", { if (osparc.product.Utils.isProduct("tiplite")) { control.set({ cursor: "pointer", - toolTipText: this.tr("This is TIP lite, a light version of TIP.
Request access to TIP.") + toolTipText: this.tr("This is TIP.lite, a light version of TIP.
Request access to TIP.") }); control.addListener("tap", () => osparc.product.TIPTeaser.getInstance().open()); }