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

Display version from package.json in left menu #5478

Merged
merged 3 commits into from Mar 12, 2020

Conversation

soupette
Copy link
Contributor

@soupette soupette commented Mar 9, 2020

Description of what you did:

This PR uses the version from the package.json to display the built version in the left menu. This PR will let users know if they have updated their administration panel correctly.

…back-end

Signed-off-by: soupette <cyril.lpz@gmail.com>
@soupette soupette requested review from HichamELBSI and alexandrebodin and removed request for HichamELBSI March 9, 2020 15:47
@soupette soupette added this to the 3.0.0-beta.19.4 milestone Mar 9, 2020
@soupette soupette added source: core:admin Source is core/admin package issue: enhancement Issue suggesting an enhancement to an existing feature labels Mar 9, 2020
@alexandrebodin
Copy link
Member

It would be cool to add a warning by comparing the data you get from the getEnv and the built version with this change.

Signed-off-by: soupette <cyril.lpz@gmail.com>
@codecov
Copy link

codecov bot commented Mar 9, 2020

Codecov Report

Merging #5478 into master will increase coverage by 0.00%.
The diff coverage is 20.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #5478   +/-   ##
=======================================
  Coverage   17.73%   17.73%           
=======================================
  Files         687      687           
  Lines       10151    10154    +3     
  Branches     1643     1644    +1     
=======================================
+ Hits         1800     1801    +1     
- Misses       6961     6962    +1     
- Partials     1390     1391    +1     
Flag Coverage Δ
#front 13.15% <20.00%> (+<0.01%) ⬆️
#unit 37.04% <ø> (ø)
Impacted Files Coverage Δ
...s/strapi-admin/admin/src/containers/App/reducer.js 60.00% <20.00%> (-3.64%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 44b1b30...5dcf6ca. Read the comment docs.

@@ -1,5 +1,6 @@
// Shared constants
import { fromJS } from 'immutable';
import packageJSON from '../../../../package.json';
Copy link
Member

Choose a reason for hiding this comment

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

I think this will break because we do not copy the pkg.json file in the .cache folder :/

Signed-off-by: soupette <cyril.lpz@gmail.com>
Copy link
Member

@alexandrebodin alexandrebodin left a comment

Choose a reason for hiding this comment

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

LGTM

@alexandrebodin alexandrebodin merged commit 0b5ba26 into master Mar 12, 2020
@alexandrebodin alexandrebodin deleted the fix/admin-version branch March 12, 2020 08:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
issue: enhancement Issue suggesting an enhancement to an existing feature source: core:admin Source is core/admin package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants