maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add application deployment information to the admin page (#12149)

Browse source 
* WIP: release footprint in the admin UI

* feat: show the commit ID and the date

* chore: change env optional to empty string

* fix: change the FOREM_BUILD_DATE to RELEASE_FOOTPRINT

* feat: add Not Available as a last option

* test: last deployed time and latest commit id

* feat: update the way we change the env variable!

* fix: we need to set the RELEASE FOOTPRINT so that this clause is not hit - `return path if release_footprint.blank?`
This commit is contained in:
Ridhwana 2021-01-08 16:36:12 +02:00 • committed by GitHub
parent ccc5aa6d11
commit ebfe0ead2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.env_sample
View file

@ -17,7 +17,8 @@ export RACK_TIMEOUT_WAIT_TIMEOUT=100_000
export RACK_TIMEOUT_SERVICE_TIMEOUT=100_000
# Heroku release slug used to bust caches on deploys
export HEROKU_SLUG_COMMIT="Optional"
export HEROKU_RELEASE_CREATED_AT=""
export HEROKU_SLUG_COMMIT=""
# Redis caching storage
export REDIS_URL="redis://localhost:6379"

13
app/views/admin/admin_portals/index.html.erb
View file

@ -1,3 +1,15 @@
<div>
<div class="tag-card crayons-card p-4 m:p-6 m:pt-4 mb-4 flex flex-row relative">
<div class="mr-8">
<div class="crayons-field__description">Last deployed</div>
<div><%= ApplicationConfig["RELEASE_FOOTPRINT"].presence || ENV["HEROKU_RELEASE_CREATED_AT"].presence || "Not Available" %></div>
</div>
<div>
<div class="crayons-field__description">Latest Commit ID</div>
<div><%= ApplicationConfig["FOREM_BUILD_SHA"].presence || ENV["HEROKU_SLUG_COMMIT"].presence || "Not Available" %></div>
</div>
</div>
<div class="grid gap-2 m:gap-4 l:gap-6 m:grid-cols-2 l:grid-cols-3 px-2 m:px-0">
<% admin_menu_items.each do |menu_item| %>
<div class="tag-card crayons-card branded-4 p-4 m:p-6 m:pt-4 flex flex-col relative">
@ -9,3 +21,4 @@
</div>
<% end %>
</div>
</div>

1
spec/helpers/application_helper_spec.rb
View file

@ -48,6 +48,7 @@ RSpec.describe ApplicationHelper, type: :helper do
it "includes SiteConfig.admin_action_taken_at" do
Timecop.freeze do
allow(SiteConfig).to receive(:admin_action_taken_at).and_return(5.minutes.ago)
allow(ApplicationConfig).to receive(:[]).with("RELEASE_FOOTPRINT").and_return("abc123")
expect(helper.release_adjusted_cache_key("cache-me")).to include(SiteConfig.admin_action_taken_at.rfc3339)
end
end

18
spec/requests/admin/admin_portals_spec.rb
View file

@ -22,4 +22,22 @@ RSpec.describe "/admin", type: :request do
expect(response.body).not_to include("Config: Profile Setup")
end
end
describe "Last deployed and Lastest Commit ID card" do
it "shows 'Not Available' if the Last deployed time is missing" do
stub_const("ENV", ENV.to_h.merge("HEROKU_RELEASE_CREATED_AT" => ""))
get admin_path
expect(response.body).to include("Not Available")
end
it "shows the correct value if the Last deployed time is available" do
stub_const("ENV", ENV.to_h.merge("HEROKU_RELEASE_CREATED_AT" => "Some date"))
get admin_path
expect(response.body).to include(ENV["HEROKU_RELEASE_CREATED_AT"])
end
end
end