Skip to content

Commit 08c999a

Browse files
authored
🎨 Frontend: Credits indicator only visible in warning zone by default (🚨) (#5897)
1 parent d5a90d7 commit 08c999a

File tree

7 files changed

+11
-15
lines changed

7 files changed

+11
-15
lines changed

services/static-webserver/client/source/class/osparc/Preferences.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ qx.Class.define("osparc.Preferences", {
9595
walletIndicatorVisibility: {
9696
check: ["always", "warning"],
9797
nullable: false,
98-
init: "always",
98+
init: "warning",
9999
event: "changeWalletIndicatorVisibility",
100100
apply: "__patchPreference"
101101
},

services/static-webserver/client/source/class/osparc/desktop/preferences/pages/GeneralPage.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ qx.Class.define("osparc.desktop.preferences.pages.GeneralPage", {
5555
const lItem = new qx.ui.form.ListItem(options.label, null, options.id);
5656
walletIndicatorVisibilitySB.add(lItem);
5757
});
58-
const value2 = preferencesSettings.getWalletIndicatorVisibility();
58+
const value = preferencesSettings.getWalletIndicatorVisibility();
5959
walletIndicatorVisibilitySB.getSelectables().forEach(selectable => {
60-
if (selectable.getModel() === value2) {
60+
if (selectable.getModel() === value) {
6161
walletIndicatorVisibilitySB.setSelection([selectable]);
6262
}
6363
});
@@ -68,7 +68,7 @@ qx.Class.define("osparc.desktop.preferences.pages.GeneralPage", {
6868
form.add(walletIndicatorVisibilitySB, this.tr("Show indicator"));
6969

7070
const creditsWarningThresholdField = new qx.ui.form.Spinner().set({
71-
minimum: 100,
71+
minimum: 50,
7272
maximum: 10000,
7373
singleStep: 10,
7474
allowGrowX: false

services/static-webserver/client/source/class/osparc/info/StudyLarge.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ qx.Class.define("osparc.info.StudyLarge", {
3939
},
4040

4141
events: {
42-
"updateStudy": "qx.event.type.Data",
43-
"updateService": "qx.event.type.Data"
42+
"updateStudy": "qx.event.type.Data"
4443
},
4544

4645
properties: {

services/static-webserver/client/source/class/osparc/metadata/ClassifiersEditor.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ qx.Class.define("osparc.metadata.ClassifiersEditor", {
9999
},
100100

101101
__createClassifiersTree: function() {
102-
const studyData = this.__resourceData;
103-
const classifiers = studyData.classifiers && studyData.classifiers ? studyData.classifiers : [];
102+
const resourceData = this.__resourceData;
103+
const classifiers = resourceData.classifiers && resourceData.classifiers ? resourceData.classifiers : [];
104104
const classifiersTree = this.__classifiersTree = new osparc.filter.ClassifiersFilter("classifiersEditor", "searchBarFilter", classifiers);
105105
osparc.store.Store.getInstance().addListener("changeClassifiers", e => {
106106
classifiersTree.recreateTree();

services/static-webserver/client/source/class/osparc/metadata/QualityEditor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ qx.Class.define("osparc.metadata.QualityEditor", {
451451
"tsr_target": this.__copyQualityData["tsr_target"]
452452
};
453453
const patchData = {
454-
"quality" : newQuality
454+
"quality": newQuality
455455
};
456456
if (this.__validate(this.__schema, patchData["quality"])) {
457457
btn.setFetching(true);

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,8 @@ qx.Class.define("osparc.navigation.CreditsMenuButton", {
3737
this.getContentElement().setStyle("line-height", 1.2);
3838

3939
const preferencesSettings = osparc.Preferences.getInstance();
40-
this.__computeVisibility();
4140
preferencesSettings.addListener("changeWalletIndicatorVisibility", () => this.__computeVisibility());
42-
preferencesSettings.addListener("changeCreditsWarningThreshold", () => {
43-
this.__computeVisibility();
44-
this.__updateCredits();
45-
});
41+
preferencesSettings.addListener("changeCreditsWarningThreshold", () => this.__updateCredits());
4642

4743
const store = osparc.store.Store.getInstance();
4844
this.__contextWalletChanged(store.getContextWallet());
@@ -100,6 +96,7 @@ qx.Class.define("osparc.navigation.CreditsMenuButton", {
10096
textColor: osparc.desktop.credits.Utils.creditsToColor(creditsLeft, "text")
10197
});
10298
}
99+
this.__computeVisibility();
103100
},
104101

105102
__computeVisibility: function() {

services/web/server/src/simcore_service_webserver/users/_preferences_models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class CreditsWarningThresholdFrontendUserPreference(FrontendUserPreference):
7979

8080
class WalletIndicatorVisibilityFrontendUserPreference(FrontendUserPreference):
8181
preference_identifier: PreferenceIdentifier = "walletIndicatorVisibility"
82-
value: str | None = "always"
82+
value: str | None = "warning"
8383

8484

8585
class UserInactivityThresholdFrontendUserPreference(FrontendUserPreference):

0 commit comments

Comments
 (0)