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

🐛🎨 Pass WEBSERVER_FOLDERS flag to frontend and use it #6206

Merged
merged 7 commits into from
Aug 19, 2024
Merged

🐛🎨 Pass WEBSERVER_FOLDERS flag to frontend and use it #6206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e59ca26
fix client statics
matusdrobuliak66 Aug 19, 2024
e7d728c
Merge branch 'master' into fix-passing-disabled-folder-plugin-to-fron…
matusdrobuliak66 Aug 19, 2024
383dff7
use isFoldersEnabled
odeimaiz Aug 19, 2024
430b95b
fetchFolders always empty array for guests
odeimaiz Aug 19, 2024
c145236
Merge branch 'fix-passing-disabled-folder-plugin-to-frontend' of gith…
odeimaiz Aug 19, 2024
58f398b
check flag
odeimaiz Aug 19, 2024
3726eac
Merge branch 'master' into enh/use-folders-enabled-flag
odeimaiz Aug 19, 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
35 changes: 21 additions & 14 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 @@ -100,9 +100,11 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
initResources: function() {
this._resourcesList = [];
const promises = [
this.__getActiveStudy(),
osparc.store.Folders.getInstance().fetchFolders(null)
this.__getActiveStudy()
];
if (osparc.utils.DisabledPlugins.isFoldersEnabled()) {
promises.push(osparc.store.Folders.getInstance().fetchFolders());
}
Promise.all(promises)
.then(() => {
this.getChildControl("resources-layout");
Expand Down Expand Up @@ -182,11 +184,14 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
// Most probably is a product-stranger user (it can also be that the catalog is down)
const nStudies = "_meta" in resp ? resp["_meta"]["total"] : 0;
if (nStudies === 0) {
Promise.all([
const promises = [
osparc.store.Store.getInstance().getTemplates(),
osparc.service.Store.getServicesLatest(),
osparc.store.Folders.getInstance().fetchFolders(),
]).then(values => {
];
if (osparc.utils.DisabledPlugins.isFoldersEnabled()) {
promises.push(osparc.store.Folders.getInstance().fetchFolders());
}
Promise.all(promises).then(values => {
const templates = values[0];
const services = values[1];
if (templates.length === 0 && Object.keys(services).length === 0) {
Expand Down Expand Up @@ -388,15 +393,17 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
},

__applyCurrentFolderId: function(currentFolderId) {
osparc.store.Folders.getInstance().fetchFolders(currentFolderId)
.then(() => {
this._resourcesContainer.setResourcesToList([]);
this._resourcesList = [];
this.invalidateStudies();

this.__reloadResources();
})
.catch(console.error);
if (osparc.utils.DisabledPlugins.isFoldersEnabled()) {
osparc.store.Folders.getInstance().fetchFolders(currentFolderId)
.then(() => {
this._resourcesContainer.setResourcesToList([]);
this._resourcesList = [];
this.invalidateStudies();

this.__reloadResources();
})
.catch(console.error);
}
},

_folderUpdated: function() {
Expand Down
6 changes: 6 additions & 0 deletions services/static-webserver/client/source/class/osparc/store/Folders.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ qx.Class.define("osparc.store.Folders", {
foldersCached: null,

fetchFolders: function(folderId = null) {
if (osparc.auth.Data.getInstance().isGuest()) {
return new Promise(resolve => {
resolve([]);
});
}

const params = {
"url": {
folderId
Expand Down
3 changes: 2 additions & 1 deletion services/static-webserver/client/source/class/osparc/utils/DisabledPlugins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ qx.Class.define("osparc.utils.DisabledPlugins", {
VERSION_CONTROL: "WEBSERVER_VERSION_CONTROL",
META_MODELING: "WEBSERVER_META_MODELING",
CLUSTERS: "WEBSERVER_CLUSTERS",
FOLDERS: "WEBSERVER_FOLDERS",

isFoldersEnabled: function() {
return osparc.utils.Utils.isDevelopmentPlatform();
return !this.__isPluginDisabled(this.FOLDERS);
},

isExportDisabled: function() {
Expand Down
1 change: 1 addition & 0 deletions services/web/server/src/simcore_service_webserver/application_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ def _get_disabled_public_plugins(self) -> list[str]:
public_plugin_candidates: Final = {
"WEBSERVER_CLUSTERS",
"WEBSERVER_EXPORTER",
"WEBSERVER_FOLDERS",
"WEBSERVER_META_MODELING",
"WEBSERVER_PAYMENTS",
"WEBSERVER_SCICRUNCH",
Expand Down
3 changes: 3 additions & 0 deletions services/web/server/tests/unit/isolated/test_application_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,9 @@ def test_settings_to_client_statics_plugins(
monkeypatch.setenv("WEBSERVER_VERSION_CONTROL", "0")
disable_plugins.add("WEBSERVER_VERSION_CONTROL")

monkeypatch.setenv("WEBSERVER_FOLDERS", "0")
disable_plugins.add("WEBSERVER_FOLDERS")

settings = ApplicationSettings.create_from_envs()
statics = settings.to_client_statics()

Expand Down
Loading