Skip to content
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

🎨🐛 [Frontend] Notifications: disable unknown resources #6679

Merged
merged 4 commits into from
Nov 6, 2024
Merged

🎨🐛 [Frontend] Notifications: disable unknown resources #6679

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0a947e
disable the notifications with unknown resources
odeimaiz Nov 6, 2024
0b359ad
fix
odeimaiz Nov 6, 2024
6d1c551
minor
odeimaiz Nov 6, 2024
ff2beb1
Merge branch 'master' into enh/notifications-unknown-resource
odeimaiz Nov 6, 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
73 changes: 35 additions & 38 deletions services/static-webserver/client/source/class/osparc/notification/NotificationUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,7 @@ qx.Class.define("osparc.notification.NotificationUI", {
return control || this.base(arguments, id);
},

__applyNotification: async function(notification) {
console.log("notification", notification);
__applyNotification: function(notification) {
let resourceId = null;
if (notification.getResourceId()) {
resourceId = notification.getResourceId();
Expand All @@ -124,90 +123,88 @@ qx.Class.define("osparc.notification.NotificationUI", {
}
const userFromId = notification.getUserFromId();

let source = "";
let title = "";
let description = "";
const icon = this.getChildControl("icon");
const titleLabel = this.getChildControl("title");
titleLabel.setValue(notification.getTitle());
const descriptionLabel = this.getChildControl("text");
descriptionLabel.setValue(notification.getText());

switch (notification.getCategory()) {
case "NEW_ORGANIZATION":
source = "@FontAwesome5Solid/users/14";
icon.setSource("@FontAwesome5Solid/users/14");
if (resourceId) {
const group = await osparc.store.Store.getInstance().getGroup(resourceId);
description = "You're now member of '" + group["name"] + "'";
osparc.store.Store.getInstance().getGroup(resourceId)
.then(group => descriptionLabel.setValue("You're now member of '" + group["label"] + "'"))
.catch(() => this.setEnabled(false));
}
break;
case "STUDY_SHARED":
source = "@FontAwesome5Solid/file/14";
icon.setSource("@FontAwesome5Solid/file/14");
if (resourceId) {
const params = {
url: {
"studyId": resourceId
}
};
const study = await osparc.data.Resources.getOne("studies", params);
const studyAlias = osparc.product.Utils.getStudyAlias({
firstUpperCase: true
});
if (study) {
title = `${studyAlias} '${study["name"]}'`;
}
osparc.data.Resources.getOne("studies", params)
.then(study => {
const studyAlias = osparc.product.Utils.getStudyAlias({
firstUpperCase: true
});
titleLabel.setValue(`${studyAlias} '${study["name"]}'`);
})
.catch(() => this.setEnabled(false));
}
if (userFromId) {
const user = osparc.store.Store.getInstance().getUser(userFromId);
if (user) {
description = "was shared by " + user["label"];
descriptionLabel.setValue("was shared by " + user["label"]);
}
}
break;
case "TEMPLATE_SHARED":
source = "@FontAwesome5Solid/copy/14";
icon.setSource("@FontAwesome5Solid/copy/14");
if (resourceId) {
const template = osparc.store.Store.getInstance().getTemplate(resourceId);
const templateAlias = osparc.product.Utils.getTemplateAlias({
firstUpperCase: true
});
if (template) {
title = `${templateAlias} '${template["name"]}'`;
const templateAlias = osparc.product.Utils.getTemplateAlias({
firstUpperCase: true
});
titleLabel.setValue(`${templateAlias} '${template["name"]}'`);
} else {
this.setEnabled(false);
}
}
if (userFromId) {
const user = osparc.store.Store.getInstance().getUser(userFromId);
if (user) {
description = "was shared by " + user["label"];
descriptionLabel.setValue("was shared by " + user["label"]);
}
}
break;
case "ANNOTATION_NOTE":
source = "@FontAwesome5Solid/file/14";
icon.setSource("@FontAwesome5Solid/file/14");
if (resourceId) {
const params = {
url: {
"studyId": resourceId
}
};
const study = await osparc.data.Resources.getOne("studies", params);
if (study) {
title = `Note added in '${study["name"]}'`;
}
osparc.data.Resources.getOne("studies", params)
.then(study => titleLabel.setValue(`Note added in '${study["name"]}'`))
.catch(() => this.setEnabled(false));
}
if (userFromId) {
const user = osparc.store.Store.getInstance().getUser(userFromId);
if (user) {
description = "was added by " + user["label"];
descriptionLabel.setValue("was added by " + user["label"]);
}
}
break;
case "WALLET_SHARED":
source = "@MaterialIcons/account_balance_wallet/14";
icon.setSource("@MaterialIcons/account_balance_wallet/14");
break;
}
const icon = this.getChildControl("icon");
icon.setSource(source);

const titleLabel = this.getChildControl("title");
titleLabel.setValue(title ? title : notification.getTitle());

const descriptionLabel = this.getChildControl("text");
descriptionLabel.setValue(description ? description : notification.getText());

const date = this.getChildControl("date");
notification.bind("date", date, "value", {
Expand Down
Loading