Skip to content

Fixed cached classifiers #1755

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 4 commits into from
Aug 31, 2020
Merged

Fixed cached classifiers #1755

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
632c06e
fixed classifiers' cache
odeimaiz Aug 28, 2020
16945b8
Update Store.js
odeimaiz Aug 28, 2020
9a51eed
@GitHK Show right label in Permissions
odeimaiz Aug 31, 2020
2906e7f
Merge branch 'master' into bugfix/classifiers
odeimaiz Aug 31, 2020
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
4 changes: 2 additions & 2 deletions services/web/client/source/class/osparc/data/Resources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ qx.Class.define("osparc.data.Resources", {
* GROUPS/DAGS
*/
"dags": {
usesCache: true,
useCache: true,
idField: "key",
endpoints: {
post: {
Expand Down Expand Up @@ -342,7 +342,7 @@ qx.Class.define("osparc.data.Resources", {
* Gets the json object containing sample classifiers
*/
"classifiers": {
useCache: true,
useCache: false,
idField: "classifiers",
endpoints: {
get: {
Expand Down
53 changes: 51 additions & 2 deletions services/web/client/source/class/osparc/store/Store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ qx.Class.define("osparc.store.Store", {
init: {}
},
classifiers: {
check: "Object",
init: {}
check: "Array",
init: []
}
},

Expand Down Expand Up @@ -460,6 +460,55 @@ qx.Class.define("osparc.store.Store", {
});
},

__getOrgClassifiers: function(orgId) {
const params = {
url: {
"gid": orgId
}
};
return osparc.data.Resources.get("classifiers", params);
},

getAllClassifiers: function(reload = false) {
return new Promise((resolve, reject) => {
const oldClassifiers = this.getClassifiers();
if (!reload && oldClassifiers.length) {
resolve(oldClassifiers);
return;
}
osparc.store.Store.getInstance().getGroupsOrganizations()
.then(orgs => {
const allClassifiers = [];
if (orgs.length === 0) {
this.setClassifiers(allClassifiers);
resolve(allClassifiers);
return;
}
const classifierPromises = [];
orgs.forEach(org => {
classifierPromises.push(this.__getOrgClassifiers(org["gid"]));
});
Promise.all(classifierPromises)
.then(classifierss => {
if (classifierss.length === 0) {
this.setClassifiers(allClassifiers);
resolve(allClassifiers);
return;
}
classifierss.forEach(({classifiers}) => {
if (classifiers) {
Object.keys(classifiers).forEach(key => {
allClassifiers.push(classifiers[key]);
});
}
});
this.setClassifiers(allClassifiers);
resolve(allClassifiers);
});
});
});
},

_applyStudy: function(newStudy) {
if (newStudy) {
this.setCurrentStudyId(newStudy.getStudyId());
Expand Down
40 changes: 9 additions & 31 deletions services/web/client/source/class/osparc/utils/Classifiers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,38 +30,16 @@ qx.Class.define("osparc.utils.Classifiers", {
label: "root",
children: []
};
osparc.store.Store.getInstance().getGroupsOrganizations()
.then(orgs => {
if (orgs.length === 0) {
reject();
return;
osparc.store.Store.getInstance().getAllClassifiers()
.then(classifiers => {
const keys = Object.keys(classifiers);
if (keys.length) {
// Tree-ify
const tree = {};
keys.forEach(key => this.__buildTree(classifiers, key, classifiers[key].classifier.split("::"), tree));
rootData.children.push(...this.__virtualTree(tree));
}
const classifierPromises = [];
orgs.forEach(org => {
const params = {
url: {
"gid": org["gid"]
}
};
classifierPromises.push(osparc.data.Resources.get("classifiers", params));
});
Promise.all(classifierPromises)
.then(classifierss => {
if (classifierss.length === 0) {
reject();
return;
}
classifierss.forEach(({classifiers}) => {
const keys = Object.keys(classifiers);
if (keys.length) {
// Tree-ify
const tree = {};
keys.forEach(key => this.__buildTree(classifiers, key, classifiers[key].classifier.split("::"), tree));
rootData.children.push(...this.__virtualTree(tree));
}
});
resolve(rootData);
});
resolve(rootData);
});
});
},
Expand Down