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

[Fixes #5419] Hierarchical keyword and [Fixes #5446] Binary files removed /lib #5447

Merged
merged 2 commits into from
Jan 7, 2020

Conversation

t-book
Copy link
Contributor

@t-book t-book commented Dec 23, 2019

This PR Fixes #5446 Fixes #5419

# 5419 Hierarchical keyword

Left paddings have been removed. Icons will not overlap anymore.

Bildschirmfoto 2019-12-20 um 16 08 43

# 5446 binary files removed from lib

The lib directory which gets created from grunt:production has several binary files that are not respected on built.

Things I've considered:


Files are already copied to /img further the gruntfile has a task to fix the different paths in css files https://github.com/GeoNode/geonode/blob/master/geonode/static/gruntfile.js#L109-L176
This means the cleanest way is just adding more replacements here.
❗ I've discarded this solution as most of the binaries are used for leaflet which is currently not fully working/testable.


Create a separate npm-package which only has the binary files in question, add it to package.json and sync files with grunt.
❗ I've discarded this solution as others might miss permissions to update the package.


Update static_dependencies.json and gruntfile to copy files to their destination.
✔️ I've chosen this solution even if it's a bit redundant

Therefore files in question are now mentioned in:

  • static_dependencies.json
  • gruntfile.js

Checklist

  • Confirm you have read the contribution guidelines
  • You have sent a Contribution Licence Agreement (CLA) as necessary (not required for small changes, e.g., fixing typos in the documentation)
  • Make sure the first PR targets the master branch, eventual backports will be managed later. This can be ignored if the PR is fixing an issue that only happens in a specific branch, but not in newer ones.
  • There is a ticket in https://github.com/GeoNode/geonode/issues describing the issue/improvement/feature (a notable exemptions is, changes not visible to end users)
  • The issue connected to the PR must have Labels and Milestone assigned
  • PR for bug fixes and small new features are presented as a single commit
  • Commit message must be in the form "[Fixes #<issue_number>] Title of the Issue"
  • New unit tests have been added covering the changes, unless there are explanation on why the tests are not necessary/implemented
  • This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR)
  • This PR passes the QA checks: flake8 geonode
  • Commits changing the settings, UI, existing user workflows, or adding new functionality, need to include documentation updates

@cla-bot cla-bot bot added the cla-signed CLA Bot: community license agreement signed label Dec 23, 2019
@t-book t-book requested a review from afabiani December 23, 2019 09:25
@t-book t-book self-assigned this Dec 23, 2019
@t-book t-book added this to the 2.10.2 milestone Dec 23, 2019
@t-book t-book added backport 2.10.x frontend Issues regarding Frontend and styling labels Dec 23, 2019
@t-book t-book changed the title [Fixes #5446] [Fixes #5419] Hierarchical keyword and Fix binary files removed [Fixes #5419] Hierarchical keyword and [Fixes #5446] Fix binary files removed Dec 23, 2019
@t-book t-book changed the title [Fixes #5419] Hierarchical keyword and [Fixes #5446] Fix binary files removed [Fixes #5419] Hierarchical keyword and [Fixes #5446] Binary files removed /lib Dec 23, 2019
@codecov
Copy link

codecov bot commented Dec 26, 2019

Codecov Report

Merging #5447 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #5447   +/-   ##
=======================================
  Coverage   57.57%   57.57%           
=======================================
  Files         172      172           
  Lines       19299    19299           
  Branches     3006     3006           
=======================================
  Hits        11112    11112           
  Misses       7167     7167           
  Partials     1020     1020

@afabiani afabiani merged commit 4a389a1 into GeoNode:master Jan 7, 2020
afabiani pushed a commit that referenced this pull request Jan 7, 2020
[Fixes #5419] Hierarchical keyword and [Fixes #5446] Binary files removed /lib

(cherry picked from commit 4a389a1)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed CLA Bot: community license agreement signed frontend Issues regarding Frontend and styling
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Grunt production removes binary files Hierarchical keyword tree widget issues
2 participants