ui: modify content path #5950
Merged
ui: modify content path #5950
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
rboyer
reviewed
Jun 11, 2019
rboyer
reviewed
Jun 11, 2019
rboyer
reviewed
Jun 11, 2019
rboyer
reviewed
Jun 11, 2019
mkeeler
requested changes
Jun 11, 2019
|
@s-christoff Looks like you need to run |
hanshasselberg
requested changes
Jun 12, 2019
|
Great set of changes - looking forward to having context path finally! 🎉 |
schristoff
requested review from
rboyer,
johncowen,
mkeeler,
hanshasselberg and
a team
…y at runtime (#5934) * ui: Only inject {{.ContentPath}} if we are makeing a prod build... ...otherwise we just use the current rootURL This gets injected into a <base /> node which solves the assets path problem but not the ember problem * ui: Pull out the <base href=""> value and inject it into ember env See previous commit: The <base href=""> value is 'sometimes' injected from go at index serve time. We pass this value down to ember by overwriting the ember config that is injected via a <meta> tag. This has to be done before ember bootup. Sometimes (during testing and development, basically not production) this is injected with the already existing value, in which case this essentially changes nothing. The code here is slightly abstracted away from our specific usage to make it easier for anyone else to use, and also make sure we can cope with using this same method to pass variables down from the CLI through to ember in the future.
Unfortuantely we can't seem to be able to use <base> and rootURL
together as URL paths will get doubled up (`ui/ui/`).
This moves all the things that we need to interpolate with .ContentPath
to the `startup` javascript so we can conditionally print out
`{{.ContentPath}}` in lots of places (now we can't use base)
…5945) ...and potentially more environments Testing has more additional things in a separate index.html in `tests/` This make the entire thing a little saner and uses just javascriopt template literals instead of a pseudo handbrake synatx for our templating of these files. Intead of just templating the entire file this way, we still only template `{{content-for 'head'}}` and `{{content-for 'body'}}` in this way to ensure we support other plugins/addons
* build: Loosen up the regex for retrieving the CONSUL_VERSION 1. Previously the `sed` replacement was searching for the CONSUL_VERSION comment at the start of a line, it no longer does this to allow for indentation. 2. Both `grep` and `sed` where looking for the omment at the end of the line. We've removed this restriction here. We don't need to remove it right now, but if we ever put the comment followed by something here the searching would break. 3. Added `xargs` for trimming the resulting version string. We aren't using this already in the rest of the scripts, but we are pretty sure this is available on most systems. * ui: Fix erroneous variable, and also force an ember cache clean on build 1. We referenced a variable incorrectly here, this fixes that. 2. We also made sure that every `make` target clears ember's `tmp` cache to ensure that its not using any caches that have since been edited everytime we call a `make` target.
Co-Authored-By: R.B. Boyer <[email protected]>
schristoff
force-pushed
the
1930-mod-context-path
branch
from
ed98ef1 to
226bda2
Compare
Co-Authored-By: Hans Hasselberg <[email protected]>
kaitlincart
reviewed
Jun 25, 2019
Co-Authored-By: kaitlincarter-hc <[email protected]>
mkeeler
approved these changes
Jun 26, 2019
agent/http.go
Outdated
|
|
||
| type redirectFS struct { | ||
| fs http.FileSystem | ||
| fs http.FileSystem | ||
| ContentPath string |
There was a problem hiding this comment.
You can get rid of the ContentPath here
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.
Allows user to replace
/ui/with their own path as long as it contains alphanumeric, -, _, or /.Fixes issue #1930 , however you cannot specify
v1as that conflicts with the API endpoint.At this time, you cannot specify a slash to strip the ending prefix or to be used with a subdomain.