From be3a16b8c67b8914181ad11642cda845889c496f Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Wed, 11 Jun 2025 16:35:34 +0200 Subject: [PATCH 1/4] refactor --- .../client/source/class/osparc/utils/Utils.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/services/static-webserver/client/source/class/osparc/utils/Utils.js b/services/static-webserver/client/source/class/osparc/utils/Utils.js index e2b4bce2a3c6..46ca23f5235b 100644 --- a/services/static-webserver/client/source/class/osparc/utils/Utils.js +++ b/services/static-webserver/client/source/class/osparc/utils/Utils.js @@ -644,13 +644,21 @@ qx.Class.define("osparc.utils.Utils", { const productName = osparc.store.StaticInfo.getInstance().getDisplayName(); const manuals = osparc.store.Support.getManuals(); const manualLink = (manuals && manuals.length) ? manuals[0].url : ""; - const supportEmail = osparc.store.VendorInfo.getInstance().getSupportEmail(); - const mailto = osparc.store.Support.mailToLink(supportEmail, "Request Account " + productName); let msg = ""; - msg += qx.locale.Manager.tr("To use all "); - msg += this.createHTMLLink(productName + " features", manualLink); + msg += qx.locale.Manager.tr("To use all ") + this.createHTMLLink(productName + " features", manualLink); + + if (osparc.product.Utils.getCreateAccountAction() === "REQUEST_ACCOUNT_FORM") { + // if the product is configured to show a form to request an account, + // then show a link to it in the message + msg += qx.locale.Manager.tr(", please send us an e-mail to create an account:"); + msg += "
"; + msg += mailto; + return msg; + } msg += qx.locale.Manager.tr(", please send us an e-mail to create an account:"); msg += "
"; + const supportEmail = osparc.store.VendorInfo.getInstance().getSupportEmail(); + const mailto = osparc.store.Support.mailToLink(supportEmail, "Request Account " + productName); msg += mailto; return msg; }, From b70456cbfdf5e54d29d3fbc4a2f54eee1f1edda4 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Wed, 11 Jun 2025 17:13:24 +0200 Subject: [PATCH 2/4] requestAccountLink --- .../client/source/class/osparc/store/Support.js | 10 ++++++++++ .../client/source/class/osparc/utils/Utils.js | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/services/static-webserver/client/source/class/osparc/store/Support.js b/services/static-webserver/client/source/class/osparc/store/Support.js index 281127d06ffb..69924a1f2405 100644 --- a/services/static-webserver/client/source/class/osparc/store/Support.js +++ b/services/static-webserver/client/source/class/osparc/store/Support.js @@ -149,6 +149,16 @@ qx.Class.define("osparc.store.Support", { return textLink; }, + requestAccountLink: function(centered = true) { + const color = qx.theme.manager.Color.getInstance().resolve("text"); + const link = window.location.origin + "/request-account"; + let textLink = `Request Account`; + if (centered) { + textLink = `
${textLink}
` + } + return textLink; + }, + getMailToLabel: function(email, subject) { const mailto = new qx.ui.basic.Label(this.mailToLink(email, subject, false)).set({ font: "text-14", diff --git a/services/static-webserver/client/source/class/osparc/utils/Utils.js b/services/static-webserver/client/source/class/osparc/utils/Utils.js index 46ca23f5235b..36ccf547b916 100644 --- a/services/static-webserver/client/source/class/osparc/utils/Utils.js +++ b/services/static-webserver/client/source/class/osparc/utils/Utils.js @@ -650,9 +650,9 @@ qx.Class.define("osparc.utils.Utils", { if (osparc.product.Utils.getCreateAccountAction() === "REQUEST_ACCOUNT_FORM") { // if the product is configured to show a form to request an account, // then show a link to it in the message - msg += qx.locale.Manager.tr(", please send us an e-mail to create an account:"); + msg += qx.locale.Manager.tr(", please request an account in the following link:"); msg += "
"; - msg += mailto; + msg += osparc.store.Support.requestAccountLink(); return msg; } msg += qx.locale.Manager.tr(", please send us an e-mail to create an account:"); From 5c21a03e0d527484e76d36f3cab4c1d44125ca7d Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Wed, 11 Jun 2025 17:14:37 +0200 Subject: [PATCH 3/4] fix link --- .../client/source/class/osparc/store/Support.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/static-webserver/client/source/class/osparc/store/Support.js b/services/static-webserver/client/source/class/osparc/store/Support.js index 69924a1f2405..028030c826dc 100644 --- a/services/static-webserver/client/source/class/osparc/store/Support.js +++ b/services/static-webserver/client/source/class/osparc/store/Support.js @@ -151,7 +151,7 @@ qx.Class.define("osparc.store.Support", { requestAccountLink: function(centered = true) { const color = qx.theme.manager.Color.getInstance().resolve("text"); - const link = window.location.origin + "/request-account"; + const link = window.location.origin + "/#/request-account"; let textLink = `Request Account`; if (centered) { textLink = `
${textLink}
` From a5afd903313d6456ac73065ff0635640862568b1 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Wed, 11 Jun 2025 17:17:59 +0200 Subject: [PATCH 4/4] minor --- .../static-webserver/client/source/class/osparc/utils/Utils.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/static-webserver/client/source/class/osparc/utils/Utils.js b/services/static-webserver/client/source/class/osparc/utils/Utils.js index 36ccf547b916..9968467efff2 100644 --- a/services/static-webserver/client/source/class/osparc/utils/Utils.js +++ b/services/static-webserver/client/source/class/osparc/utils/Utils.js @@ -645,7 +645,8 @@ qx.Class.define("osparc.utils.Utils", { const manuals = osparc.store.Support.getManuals(); const manualLink = (manuals && manuals.length) ? manuals[0].url : ""; let msg = ""; - msg += qx.locale.Manager.tr("To use all ") + this.createHTMLLink(productName + " features", manualLink); + msg += qx.locale.Manager.tr("To use all "); + msg += this.createHTMLLink(productName + " features", manualLink); if (osparc.product.Utils.getCreateAccountAction() === "REQUEST_ACCOUNT_FORM") { // if the product is configured to show a form to request an account,