Repair config issues#1814
Conversation
|
A bit of a clarification on the version number. I added that after reviewing this code, as it has bugged me many times before that there's no real way of knowing which version of the UI you're dealing with unless you know the exact history of when which feature was merged. The source of the version number is package.json. Which means we'll have to keep this up to date for every release. I used the same system as angular does. I also moved the "Enviroment: Production" message here, as on the current master it is put in the server log for every page request. With this PR it will be logged only once. When the server starts the first time. |
b37f6f5 to
5fe864c
Compare
|
@samuelcambien : This has minor merge conflicts now. Could you rebase it when you get the chance? Thanks! |
5fe864c to
c94e5d0
Compare
|
Hi Tim, I've rebased the branch and resolved the merge conflicts. Regards, Samuel |
tdonohue
left a comment
There was a problem hiding this comment.
@samuelcambien and @artlowel : First off, this works well. The bugs are no longer reproducible.
My only request though is to change the version tag added by @artlowel . See my reasoning inline below. Assuming you agree, then this is ready to merge once that tag is updated. If you disagree, we can always discuss this in more detail in our next meeting.
| { | ||
| "name": "dspace-angular", | ||
| "version": "0.0.0", | ||
| "version": "7.4.0-next.0", |
There was a problem hiding this comment.
@samuelcambien and @artlowel : Based on my reviewing of the versioning docs at https://semver.org/ and https://classic.yarnpkg.com/en/docs/dependency-versions#toc-semantic-versioning, I'd prefer if we changed this to:
7.4.0-next
My reasoning is that the .0 after the -next appears to imply that we'd have multiple -next pre-releases. So, I'd prefer we only use that if we plan to ever do beta releases... e.g. 7.4.0-beta.1 and 7.4.0-beta.2 seem reasonable. But, -next to me should be more like a -SNAPSHOT on the backend...and it's never going to be incremented like -next.0, -next.1, etc.
I also gave this versioning scheme a test using yarn version... and it says that 7.4.0-next is valid SemVer.
Once we agree on a strategy, I'll change our Release Procedure to remind us (mostly myself) to run yarn version prior to any new release in order to update this version tag.
tdonohue
left a comment
There was a problem hiding this comment.
👍 Thanks @samuelcambien and @artlowel ! This looks great to me now.
I've also updated our release procedure instructions to include instructions for using yarn version to update the "version" in package.json: https://wiki.lyrasis.org/display/DSPACE/Release+Procedure#ReleaseProcedure-ReleasetheFrontend(UI)viaaGitHubReleaseTag
atarix83
left a comment
There was a problem hiding this comment.
thanks @samuelcambien for this PR
I verified everything is working fine, mainly on cofiguration overwriting
|
Merging as this is at +2. Thanks again @samuelcambien and @artlowel ! |
[DSC-1742] remove language queryParam when locale is resolved Approved-by: Vincenzo Mecca
References
config/config.ymlare ignored #1795Description
Issue #1795: The config building mechanism has been updated to always include the default config from config.yml first. This config is then overwritten by environment config (e.g. config.dev.yml).
Issue #1795: : The 'yarn run serve' command has been repaired to use the proper 'ui' config.
Instructions for Reviewers
List of changes in this PR:
Expected results:
Checklist
yarn run lintpackage.json), I've made sure their licenses align with the DSpace BSD License based on the Licensing of Contributions documentation.