Webcomponent header #8
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tkohr
reviewed
Dec 1, 2023
Dockerfile
Outdated
| EXPOSE 80 | ||
|
|
||
| ENTRYPOINT ["sh", "/custom-start.sh", "sh", "/docker-entrypoint.sh"] |
There was a problem hiding this comment.
I guess "/docker-entrypoint.sh" refers to the other PR. But why do we need both scripts /custom-start.sh and /docker-entrypoint.sh?
|
Please rebase against master :). |
|
I think master is not up-to-date/relevant in this repo. So just needs a rebase on |
|
I rebased it on @tkohr if you can review it again :) |
tkohr
approved these changes
Dec 11, 2023
There was a problem hiding this comment.
Thanks @f-necas changes LGTM.
Just didn't understand why you added <link href="https://fonts.googleapis.comicon?family=Material+Icons|Material+Icons+Outlined" rel="stylesheet"/> to the index.html in your previous commit, but not here anymore.
f-necas
added a commit
that referenced
this pull request
Jun 26, 2024
relying on nx cache for building docker image disable nx-cloud feat: include georchestra header df: support ENV for settings df: set base href to ./ chore: build docker image datafeeder - Adding a gh action to build / publish a docker image gh-action - fixing georchestra version (docker tag) chore: lint chore: add thesaurus url to settings base-ref=/impot/' nginx - redirect onto the index.html when a UUID is present in the URL Used the following in order to write the rule: https://github.com/georchestra/geonetwork-ui/blob/georchestra/apps/datafeeder/src/app/app-routing.module.ts Note: * Not completely tested at runtime, compilation / docker image OK, the rewrite rule has been tested in a running docker image though. * There is still probably some code missing JS-side to manage these query string after the '#' char, as reloading the page after having uploaded a dataset does not reload the app at the exact same place. Concerns: This might break the usage of the docker image outside of the official georchestra docker composition, as the redirection needs the X-forwarded-* headers in order to work properly. github-actions - deactivate gh-pages related actions nginx - no redirect, just serve the index.html npm run format:fix fixing serving virtual routes for the JS app somehow nginx will return a document with an "application/octet-stream" content-type, because it probably can't figure out the type by itself. Forcing "text/html" to be returned, so that the page is not "downloaded" by the browser, but interpreted as a web page. Tests: hacking the nginx configuration using the georchestra docker composition. I was able to reload the page at the expected step once a dataset has been uploaded. chore: set proxy config for DF in georchestra chore: use node 14 in docker image change branch name in gh action change branch name from datafeeder to georchestra-datafeeder build(fix): fix dockerignore for datafeeder build build(fix): raise build job timeout and formating fixing lang calculation some browsers seem to use the "xy-ZT" format for locates, which obviously won't work as lookup key, as a two-char code is expected. tests: runtime tested implement & fix gh action to produce a docker image for the df frontend See georchestra/georchestra#3659 Also fixes the existing action, as the branch has been renamed. fix(nx): change defaultBase to georchestra-datafeeder branch chore: add more to docker ignore feat(docker): run postinstall scripts manually This is required for Nx to build its dependency graph, and then to resolve the result of `createGlobPatternsForDependencies` in the tailwind config feat(header): make df header iframe configurable moving it from index.html to app.component fix: formatting Implement custom scripts (#7) * feat: implement custom script * change entrypoint name + fix entrypoint command * let execution logic in upstream /docker-entrypoint.sh --------- Co-authored-by: Emilien Devos <[email protected]> georchestra: re-add icons removal github actions workflow see georchestra/georchestra#4105 Merge pull request #8 from georchestra/new-header
f-necas
added a commit
that referenced
this pull request
Jul 16, 2024
relying on nx cache for building docker image disable nx-cloud feat: include georchestra header df: support ENV for settings df: set base href to ./ chore: build docker image datafeeder - Adding a gh action to build / publish a docker image gh-action - fixing georchestra version (docker tag) chore: lint chore: add thesaurus url to settings base-ref=/impot/' nginx - redirect onto the index.html when a UUID is present in the URL Used the following in order to write the rule: https://github.com/georchestra/geonetwork-ui/blob/georchestra/apps/datafeeder/src/app/app-routing.module.ts Note: * Not completely tested at runtime, compilation / docker image OK, the rewrite rule has been tested in a running docker image though. * There is still probably some code missing JS-side to manage these query string after the '#' char, as reloading the page after having uploaded a dataset does not reload the app at the exact same place. Concerns: This might break the usage of the docker image outside of the official georchestra docker composition, as the redirection needs the X-forwarded-* headers in order to work properly. github-actions - deactivate gh-pages related actions nginx - no redirect, just serve the index.html npm run format:fix fixing serving virtual routes for the JS app somehow nginx will return a document with an "application/octet-stream" content-type, because it probably can't figure out the type by itself. Forcing "text/html" to be returned, so that the page is not "downloaded" by the browser, but interpreted as a web page. Tests: hacking the nginx configuration using the georchestra docker composition. I was able to reload the page at the expected step once a dataset has been uploaded. chore: set proxy config for DF in georchestra chore: use node 14 in docker image change branch name in gh action change branch name from datafeeder to georchestra-datafeeder build(fix): fix dockerignore for datafeeder build build(fix): raise build job timeout and formating fixing lang calculation some browsers seem to use the "xy-ZT" format for locates, which obviously won't work as lookup key, as a two-char code is expected. tests: runtime tested implement & fix gh action to produce a docker image for the df frontend See georchestra/georchestra#3659 Also fixes the existing action, as the branch has been renamed. fix(nx): change defaultBase to georchestra-datafeeder branch chore: add more to docker ignore feat(docker): run postinstall scripts manually This is required for Nx to build its dependency graph, and then to resolve the result of `createGlobPatternsForDependencies` in the tailwind config feat(header): make df header iframe configurable moving it from index.html to app.component fix: formatting Implement custom scripts (#7) * feat: implement custom script * change entrypoint name + fix entrypoint command * let execution logic in upstream /docker-entrypoint.sh --------- Co-authored-by: Emilien Devos <[email protected]> georchestra: re-add icons removal github actions workflow see georchestra/georchestra#4105 Merge pull request #8 from georchestra/new-header
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Webcomponent header
Needs resolution of PR :
Implements the new georchestra/header in datafeeder-ui.
Main PR :
Changes
Header script
Old iframe header is removed from the image and can be available while with an
shscript (e.g. use iframe header):For all informations about the header : see README.md