diff --git a/services/static-webserver/client/source/class/osparc/Preferences.js b/services/static-webserver/client/source/class/osparc/Preferences.js index bf105ccb43c..6d5dea18b5d 100644 --- a/services/static-webserver/client/source/class/osparc/Preferences.js +++ b/services/static-webserver/client/source/class/osparc/Preferences.js @@ -95,7 +95,7 @@ qx.Class.define("osparc.Preferences", { walletIndicatorVisibility: { check: ["always", "warning"], nullable: false, - init: "always", + init: "warning", event: "changeWalletIndicatorVisibility", apply: "__patchPreference" }, diff --git a/services/static-webserver/client/source/class/osparc/desktop/preferences/pages/GeneralPage.js b/services/static-webserver/client/source/class/osparc/desktop/preferences/pages/GeneralPage.js index 45bf60f1d84..21b09014e9c 100644 --- a/services/static-webserver/client/source/class/osparc/desktop/preferences/pages/GeneralPage.js +++ b/services/static-webserver/client/source/class/osparc/desktop/preferences/pages/GeneralPage.js @@ -55,9 +55,9 @@ qx.Class.define("osparc.desktop.preferences.pages.GeneralPage", { const lItem = new qx.ui.form.ListItem(options.label, null, options.id); walletIndicatorVisibilitySB.add(lItem); }); - const value2 = preferencesSettings.getWalletIndicatorVisibility(); + const value = preferencesSettings.getWalletIndicatorVisibility(); walletIndicatorVisibilitySB.getSelectables().forEach(selectable => { - if (selectable.getModel() === value2) { + if (selectable.getModel() === value) { walletIndicatorVisibilitySB.setSelection([selectable]); } }); @@ -68,7 +68,7 @@ qx.Class.define("osparc.desktop.preferences.pages.GeneralPage", { form.add(walletIndicatorVisibilitySB, this.tr("Show indicator")); const creditsWarningThresholdField = new qx.ui.form.Spinner().set({ - minimum: 100, + minimum: 50, maximum: 10000, singleStep: 10, allowGrowX: false diff --git a/services/static-webserver/client/source/class/osparc/info/StudyLarge.js b/services/static-webserver/client/source/class/osparc/info/StudyLarge.js index 93deaaa762f..fb9e4b942e5 100644 --- a/services/static-webserver/client/source/class/osparc/info/StudyLarge.js +++ b/services/static-webserver/client/source/class/osparc/info/StudyLarge.js @@ -39,8 +39,7 @@ qx.Class.define("osparc.info.StudyLarge", { }, events: { - "updateStudy": "qx.event.type.Data", - "updateService": "qx.event.type.Data" + "updateStudy": "qx.event.type.Data" }, properties: { diff --git a/services/static-webserver/client/source/class/osparc/metadata/ClassifiersEditor.js b/services/static-webserver/client/source/class/osparc/metadata/ClassifiersEditor.js index 43f30bfc0cf..563bfe60a5c 100644 --- a/services/static-webserver/client/source/class/osparc/metadata/ClassifiersEditor.js +++ b/services/static-webserver/client/source/class/osparc/metadata/ClassifiersEditor.js @@ -99,8 +99,8 @@ qx.Class.define("osparc.metadata.ClassifiersEditor", { }, __createClassifiersTree: function() { - const studyData = this.__resourceData; - const classifiers = studyData.classifiers && studyData.classifiers ? studyData.classifiers : []; + const resourceData = this.__resourceData; + const classifiers = resourceData.classifiers && resourceData.classifiers ? resourceData.classifiers : []; const classifiersTree = this.__classifiersTree = new osparc.filter.ClassifiersFilter("classifiersEditor", "searchBarFilter", classifiers); osparc.store.Store.getInstance().addListener("changeClassifiers", e => { classifiersTree.recreateTree(); diff --git a/services/static-webserver/client/source/class/osparc/metadata/QualityEditor.js b/services/static-webserver/client/source/class/osparc/metadata/QualityEditor.js index 92f072b5c9e..a153f3d5278 100644 --- a/services/static-webserver/client/source/class/osparc/metadata/QualityEditor.js +++ b/services/static-webserver/client/source/class/osparc/metadata/QualityEditor.js @@ -451,7 +451,7 @@ qx.Class.define("osparc.metadata.QualityEditor", { "tsr_target": this.__copyQualityData["tsr_target"] }; const patchData = { - "quality" : newQuality + "quality": newQuality }; if (this.__validate(this.__schema, patchData["quality"])) { btn.setFetching(true); diff --git a/services/static-webserver/client/source/class/osparc/navigation/CreditsMenuButton.js b/services/static-webserver/client/source/class/osparc/navigation/CreditsMenuButton.js index 463a2d12bc1..6cf7bf67e5b 100644 --- a/services/static-webserver/client/source/class/osparc/navigation/CreditsMenuButton.js +++ b/services/static-webserver/client/source/class/osparc/navigation/CreditsMenuButton.js @@ -37,12 +37,8 @@ qx.Class.define("osparc.navigation.CreditsMenuButton", { this.getContentElement().setStyle("line-height", 1.2); const preferencesSettings = osparc.Preferences.getInstance(); - this.__computeVisibility(); preferencesSettings.addListener("changeWalletIndicatorVisibility", () => this.__computeVisibility()); - preferencesSettings.addListener("changeCreditsWarningThreshold", () => { - this.__computeVisibility(); - this.__updateCredits(); - }); + preferencesSettings.addListener("changeCreditsWarningThreshold", () => this.__updateCredits()); const store = osparc.store.Store.getInstance(); this.__contextWalletChanged(store.getContextWallet()); @@ -100,6 +96,7 @@ qx.Class.define("osparc.navigation.CreditsMenuButton", { textColor: osparc.desktop.credits.Utils.creditsToColor(creditsLeft, "text") }); } + this.__computeVisibility(); }, __computeVisibility: function() { diff --git a/services/web/server/src/simcore_service_webserver/users/_preferences_models.py b/services/web/server/src/simcore_service_webserver/users/_preferences_models.py index 72dd0148e6e..01b6b87e377 100644 --- a/services/web/server/src/simcore_service_webserver/users/_preferences_models.py +++ b/services/web/server/src/simcore_service_webserver/users/_preferences_models.py @@ -79,7 +79,7 @@ class CreditsWarningThresholdFrontendUserPreference(FrontendUserPreference): class WalletIndicatorVisibilityFrontendUserPreference(FrontendUserPreference): preference_identifier: PreferenceIdentifier = "walletIndicatorVisibility" - value: str | None = "always" + value: str | None = "warning" class UserInactivityThresholdFrontendUserPreference(FrontendUserPreference):