Skip to content

🐛 [Frontend] Do not reload Studies when loading Tags #7551

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 6 commits into from
Apr 17, 2025
Merged

🐛 [Frontend] Do not reload Studies when loading Tags #7551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
62b874c
bound shared field
odeimaiz Apr 17, 2025
6e1a20a
minor
odeimaiz Apr 17, 2025
9557ba0
tagsChanged
odeimaiz Apr 17, 2025
9d1439b
minor
odeimaiz Apr 17, 2025
c903869
Merge branch 'master' into enh/share-from-editor
odeimaiz Apr 17, 2025
27a80f3
one more attribute
odeimaiz Apr 17, 2025
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
6 changes: 4 additions & 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 @@ -676,11 +676,13 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
this.setMultiSelection(false);
});

const store = osparc.store.Store.getInstance();
store.addListener("changeTags", () => {
const tagsStore = osparc.store.Tags.getInstance();
tagsStore.addListener("tagsChanged", () => {
this.invalidateStudies();
this.__reloadStudies();
}, this);

const store = osparc.store.Store.getInstance();
store.addListener("studyStateChanged", e => {
const {
studyId,
Expand Down
2 changes: 1 addition & 1 deletion services/static-webserver/client/source/class/osparc/form/tag/TagManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ qx.Class.define("osparc.form.tag.TagManager", {
if (!title) {
title = qx.locale.Manager.tr("Apply Tags");
}
return osparc.ui.window.Window.popUpInWindow(tagManager, title, 280, null).set({
return osparc.ui.window.Window.popUpInWindow(tagManager, title, 300, null).set({
allowMinimize: false,
allowMaximize: false,
showMinimize: false,
Expand Down
3 changes: 3 additions & 0 deletions services/static-webserver/client/source/class/osparc/info/StudyMedium.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ qx.Class.define("osparc.info.StudyMedium", {
}, {
label: this.tr("ACCESS RIGHTS"),
view: osparc.info.StudyUtils.createAccessRights(this.getStudy())
}, {
label: this.tr("SHARED"),
view: osparc.info.StudyUtils.createShared(this.getStudy())
}, {
label: this.tr("CREATED"),
view: osparc.info.StudyUtils.createCreationDate(this.getStudy())
Expand Down
14 changes: 14 additions & 0 deletions services/static-webserver/client/source/class/osparc/info/StudyUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,20 @@ qx.Class.define("osparc.info.StudyUtils", {
return accessRights;
},

/**
* @param study {osparc.data.model.Study} Study Model
*/
createShared: function(study) {
const isShared = new qx.ui.basic.Label();
const populateLabel = () => {
const nCollabs = Object.keys(study.getAccessRights()).length;
isShared.setValue(nCollabs === 1 ? qx.locale.Manager.tr("Not Shared") : "+" + String(nCollabs-1));
}
study.addListener("changeAccessRights", () => populateLabel());
populateLabel();
return isShared;
},

/**
* @param study {osparc.data.model.Study} Study Model
*/
Expand Down
2 changes: 1 addition & 1 deletion services/static-webserver/client/source/class/osparc/store/Tags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ qx.Class.define("osparc.store.Tags", {
.then(accessRightsArray => {
const accessRights = {};
accessRightsArray.forEach(ar => accessRights[ar.gid] = ar);
tag.setAccessRights(accessRights)
tag.setAccessRights(accessRights);
})
.catch(err => console.error(err));
},
Expand Down
1 change: 1 addition & 0 deletions services/static-webserver/client/source/class/osparc/utils/Utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ qx.Class.define("osparc.utils.Utils", {
if (control && control.getContentElement()) {
control.getContentElement().setAttribute("autocomplete", "off");
control.getContentElement().setAttribute("type", "search");
control.getContentElement().setAttribute("name", "osparc-nope1234");
}
},

Expand Down
Loading