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

fix map staying blank if no permissions on default theme #197

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix map staying blank if no permissions on default theme #197

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb4abd6
fix map staying blank if no permissions on default theme
olivierdalang Apr 28, 2022
426a40a
fix map staying blank if no permissions on default theme followup
olivierdalang May 23, 2022
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: 15 additions & 1 deletion components/StandardApp.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,21 @@ class AppInitComponent extends React.Component {
if (ConfigUtils.getConfigProp("dontLoadDefaultTheme")) {
return;
}
theme = ThemeUtils.getThemeById(themes, themes.defaultTheme);

// Determine default theme, and fallback if not available
let availableThemes = themes.items.map((t) => t.id);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Theme items might potentially be nested.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok will try to come up with a commit that handles nested themes. Would you have a sample themes.json test with, or some info in how to create projects that have nested themes ? Is it with QGIS themes in the project ?

(In my themes.json, I see sublayers, but nothing looking like nested themes, not even an empty list)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Theme items might potentially be nested.

let defaultTheme = themes.defaultTheme;
if (!availableThemes.includes(themes.defaultTheme)) {
console.log(`Default theme (${themes.defaultTheme}) is not available.`);
if (availableThemes.length > 0) {
defaultTheme = themes.items[0].id;
console.log(`Falling back to ${defaultTheme}.`);
} else {
console.log(`No available theme to fallback to.`);
}
}

theme = ThemeUtils.getThemeById(themes, defaultTheme);
}
const layerParams = params.l !== undefined ? params.l.split(",").filter(entry => entry) : null;
if (layerParams && ConfigUtils.getConfigProp("urlReverseLayerOrder")) {
Expand Down