Skip to content

🎨 [Frontend] Access Full TIP #6423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 23, 2024
Merged

🎨 [Frontend] Access Full TIP #6423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8af62fb
move button to user menu
odeimaiz Sep 23, 2024
1ef4914
minor
odeimaiz Sep 23, 2024
2e02680
fix
odeimaiz Sep 23, 2024
546bae1
Full
odeimaiz Sep 23, 2024
087a019
minor
odeimaiz Sep 23, 2024
72c4252
Full
odeimaiz Sep 23, 2024
8a64a51
linting
odeimaiz Sep 23, 2024
3d56653
TIP.lite
odeimaiz Sep 23, 2024
c76ae1e
Merge branch 'master' into enh/move-access-tip
odeimaiz Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
newStudyBtn.setCardKey("new-study");
newStudyBtn.subscribeToFilterGroup("searchBarFilter");
osparc.utils.Utils.setIdToWidget(newStudyBtn, "newStudyBtn");
Expand Down
19 changes: 7 additions & 12 deletions services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -186,6 +183,13 @@ 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({
cursor: "pointer",
toolTipText: this.tr("This is TIP.lite, a light version of TIP.<br>Request access to TIP.")
});
control.addListener("tap", () => osparc.product.TIPTeaser.getInstance().open());
}
this.getChildControl("left-items").add(control);
break;
case "logo-powered":
Expand Down Expand Up @@ -231,15 +235,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);
Expand Down
24 changes: 18 additions & 6 deletions services/static-webserver/client/source/class/osparc/navigation/UserMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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.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"));
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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");

Expand Down
2 changes: 1 addition & 1 deletion services/static-webserver/client/source/class/osparc/product/TIPTeaser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Loading