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.

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

Feature/764 background layer info #808

Merged
merged 21 commits into from
Aug 31, 2021
Merged

Conversation

hitomin21
Copy link
Contributor

Pull request for issue #764

I have modified so Backgroundswitcher uses LayerItem to display its layers. This introduced errors since the default layers (vit, svart and OSM) does not have enough metadata or even OL layers. I added extra metadata for these layers in Backgroundswitcher to ensure they do not cause a crash in LayerItem or LayerSettings.

We can now configure the layerinformation in admin in the same way as for normal layers and it is displayed for the background layers in the same manner so we do not have to duplicate code.

@hitomin21 hitomin21 requested a review from jacobwod May 28, 2021 13:50
Copy link
Member

@jacobwod jacobwod left a comment

Choose a reason for hiding this comment

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

Please check and solve all basic compilation warnings prior PR.
Skärmavbild 2021-06-04 kl  14 25 10

Also, the layout looks bad compared to how it was before, ensure that you don't modify the left padding this much.

I'm closing this PR for now, please verify the code (perhaps ask @jesade-vbg to do some checks too) before you open the PR again.
Skärmavbild 2021-06-04 kl  14 28 15

@jacobwod jacobwod closed this Jun 4, 2021
@hitomin21 hitomin21 reopened this Jun 22, 2021
@hitomin21
Copy link
Contributor Author

I have updated the code and gotten an additional review from Jesper. The code has been merged with the latest from develop as well.

Copy link
Member

@jacobwod jacobwod left a comment

Choose a reason for hiding this comment

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

I can not approve a PR where most of the changes come from different Prettier settings.

Please take a look at the PR you're submitting. You can clearly see that something's wrong looking only at the number of changed files (33!).

@jesade-vbg
Copy link
Contributor

Skärmbild 2021-06-23 080317
When I fix the prettier problems with "prettier --write" it works. But then Husky converts them back again right before commit.
I've cleared node_modules etc.-.no luck. Still investigating.

@hitomin21
Copy link
Contributor Author

I think that the formated lines in the .md files and new-admin/src/views/informativeeditor.jsx are correct with the changes in this PR so I left it.

It is starting to become late here so I will run some tests tomorrow to confirm everything is working after the formatting updates.

@hitomin21
Copy link
Contributor Author

Koden fungerar fortfarande, utseendet är såhär nu
bild

Copy link
Member

@jacobwod jacobwod left a comment

Choose a reason for hiding this comment

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

Why does this PR contain changes to CONTRIBUTING.md and README.md?

@hitomin21
Copy link
Contributor Author

When I reverted the formatting I noticed that the changes to CONTRIBUTING.md and README.md was probably correct, i.e. correctly formatted now and therefore left it. I can revert it if you want me to. Same with new-admin/src/views/informativeeditor.jsx.

@jacobwod
Copy link
Member

Absolutely, your PR should only contain actual changes related to this issue - not unresolved conflicts or reverts to previous versions.

@hitomin21
Copy link
Contributor Author

hitomin21 commented Jun 30, 2021

Reverted the prettier modifications for the other files

@hitomin21 hitomin21 dismissed jacobwod’s stale review August 17, 2021 13:02

Fixed with revert

@Hallbergs
Copy link
Member

LGTM

@Hallbergs Hallbergs merged commit 7991515 into develop Aug 31, 2021
@Hallbergs Hallbergs deleted the feature/764-background-layer-info branch August 31, 2021 08:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants