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] Studies: list more than 5 studies in folder #6813

Merged
merged 10 commits into from
Nov 25, 2024
Merged

🐛 [Frontend] Studies: list more than 5 studies in folder #6813

Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dbb5a66
compare strings and integers
odeimaiz Nov 22, 2024
1c43a79
renaming
odeimaiz Nov 22, 2024
8277d29
Merge branch 'master' into fix/projects-in-folder
odeimaiz Nov 22, 2024
3ed6e06
comment
odeimaiz Nov 22, 2024
66516c7
Merge branch 'fix/projects-in-folder' of github.com:odeimaiz/osparc-s…
odeimaiz Nov 22, 2024
2d9d09a
less patching
odeimaiz Nov 22, 2024
d8e3d99
Merge branch 'master' into fix/projects-in-folder
odeimaiz Nov 25, 2024
f32e40a
Merge branch 'master' into fix/projects-in-folder
odeimaiz Nov 25, 2024
e7dc7d6
Merge branch 'master' into fix/projects-in-folder
odeimaiz Nov 25, 2024
018acb4
Merge branch 'master' into fix/projects-in-folder
odeimaiz Nov 25, 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
16 changes: 9 additions & 7 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 @@ -631,16 +631,18 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
// check the entries in currentParams are the same as the reqParams
let sameContext = true;
Object.entries(currentParams).forEach(([key, value]) => {
sameContext &= key in reqParams && reqParams[key] === value;
// loose equality: will do a Number to String conversion if necessary
sameContext &= key in reqParams && reqParams[key] == value;
});
return !sameContext;
},

__getNextPageParams: function() {
if (this._resourcesContainer.getFlatList() && this._resourcesContainer.getFlatList().nextRequest) {
const studiesContainer = this._resourcesContainer.getFlatList();
if (studiesContainer && studiesContainer.nextRequest) {
// Context might have been changed while waiting for the response.
// The new call is on the way, therefore this response can be ignored.
const url = new URL(this._resourcesContainer.getFlatList().nextRequest);
const url = new URL(studiesContainer.nextRequest);
const urlSearchParams = new URLSearchParams(url.search);
const urlParams = {};
for (const [snakeKey, value] of urlSearchParams.entries()) {
Expand All @@ -650,12 +652,12 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
const contextChanged = this.__didContextChange(urlParams);
if (
!contextChanged &&
osparc.utils.Utils.hasParamFromURL(this._resourcesContainer.getFlatList().nextRequest, "offset") &&
osparc.utils.Utils.hasParamFromURL(this._resourcesContainer.getFlatList().nextRequest, "limit")
osparc.utils.Utils.hasParamFromURL(studiesContainer.nextRequest, "offset") &&
osparc.utils.Utils.hasParamFromURL(studiesContainer.nextRequest, "limit")
) {
return {
offset: osparc.utils.Utils.getParamFromURL(this._resourcesContainer.getFlatList().nextRequest, "offset"),
limit: osparc.utils.Utils.getParamFromURL(this._resourcesContainer.getFlatList().nextRequest, "limit")
offset: osparc.utils.Utils.getParamFromURL(studiesContainer.nextRequest, "offset"),
limit: osparc.utils.Utils.getParamFromURL(studiesContainer.nextRequest, "limit")
};
}
}
Expand Down
Loading