From 6a840eda9513a1dc408aa0d5709a2d425c274f14 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Fri, 31 May 2024 15:10:42 +0100 Subject: [PATCH 01/23] docs: updated CHANGELOG to reflect the updated date as well as the latest internal change --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5dca82..dcd2383 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,10 @@ This app presents the landing page experience for landregistry.data.gov.uk, including the SPARQL Qonsole -## 1.7.6 - 2024-03-12 +## 1.7.6 - 2024-06 +- (Jon) - Updated the deployment.yaml file to mirror the new branch names post + branch cleanup. - (Jon) Reconfigured the `detailed documentation` links, both english and welsh, to point to the `app/doc/ppd` path; alongside adding tests querying the new route to ensure the route is valid and contains the expected content. All From bdc179eef7a10a6a01177eb500ee59288d311def Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 12 Mar 2024 16:43:08 +0000 Subject: [PATCH 02/23] fix: resolves missing ppd doc issue also includes permanent redirections for outdated variances of the ppd doc path value --- config/routes.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index fa10994..f475f22 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,7 +9,9 @@ get 'landing/hpi', to: 'landing#hpi' get 'doc/hpi', to: 'doc#hpi', as: 'hpi_doc' get 'doc/ukhpi', to: redirect('/app/ukhpi/doc', status: 302) - get 'doc/ppd', to: 'doc#ppd', as: 'ppd_doc' + get 'app/doc/ppd', to: 'doc#ppd', as: 'ppd_doc' + get 'doc/ppd', to: redirect('/app/doc/ppd', status: 301) + get 'app/root/doc/ppd', to: redirect('app/doc/ppd', status: 301) get 'doc/ukhpi-dsd', to: redirect('/app/ukhpi/doc/ukhpi-dsd', status: 302) get 'doc/ukhpi-user-guide', to: redirect('/app/ukhpi/doc/ukhpi-user-guide', status: 302) get 'doc/accessibility', to: 'doc#accessibility' From ccfcdf00b0b7caf6a62ef48e48efa5e8224d70e0 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 12 Mar 2024 16:54:57 +0000 Subject: [PATCH 03/23] test: updated ppd doc link tests first test verifies older link redirects permanently, second test verifies redirection also is permanent, third test ensures the link responds with success status (200), and fourth test ensures the page's opening content is what's expected --- test/integration/documentation_test.rb | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/test/integration/documentation_test.rb b/test/integration/documentation_test.rb index bb212a5..168756c 100644 --- a/test/integration/documentation_test.rb +++ b/test/integration/documentation_test.rb @@ -14,8 +14,24 @@ class DocumentationTest < ActionDispatch::IntegrationTest assert_equal(302, response.status) end - test 'PPD docs page' do + test 'older PPD doc link redirects with permanent 301 status' do get '/doc/ppd' + assert_equal(301, response.status) + end + + test 'old PPD doc link redirects with permanent 301 status' do + get '/app/root/doc/ppd' + assert_equal(301, response.status) + end + + test 'ppd_doc_path variable links correctly' do + get ppd_doc_path + assert_response :success + end + + test 'ppd doc loads correctly' do + get ppd_doc_path assert_select 'h1', 'Price Paid Linked Data' + assert_select 'h2', 'What does the Price Paid Dataset consist of?' end end From 136aa0878a670566345b1588229764ae86a1dd2c Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 12 Mar 2024 16:55:46 +0000 Subject: [PATCH 04/23] style: rubocop automatic fixes --- app/controllers/application_controller.rb | 1 - config/initializers/sentry.rb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7dc66f6..9df9271 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -28,5 +28,4 @@ def set_locale def change_default_caching_policy expires_in 5.minutes, public: true, must_revalidate: true if Rails.env.production? end - end diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb index 623e854..ae6a3ce 100644 --- a/config/initializers/sentry.rb +++ b/config/initializers/sentry.rb @@ -3,7 +3,7 @@ if ENV['SENTRY_API_KEY'] Sentry.init do |config| config.dsn = ENV['SENTRY_API_KEY'] - config.environment = ENV['DEPLOYMENT_ENVIRONMENT'] || Rails.env + config.environment = ENV.fetch('DEPLOYMENT_ENVIRONMENT') { Rails.env } config.enabled_environments = %w[production] config.release = Version::VERSION config.breadcrumbs_logger = %i[active_support_logger http_logger] From ba869182be5882925dd4439090f8375e2b163cf3 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 12 Mar 2024 16:56:07 +0000 Subject: [PATCH 05/23] build: updated gem system update version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c7ba76b..11d86f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apk add --update \ nodejs \ tzdata \ && rm -rf /var/cache/apk/* \ - && gem update --system \ + && gem update --system 3.4.22 \ && gem install bundler:$BUNDLER_VERSION \ && bundle config --global frozen 1 From 9d3c5778b54db5afa571a52cfff9104bcfadc81c Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 12 Mar 2024 16:56:24 +0000 Subject: [PATCH 06/23] build: updated version PATCH cadence --- app/lib/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/version.rb b/app/lib/version.rb index 30b1795..4b828a8 100644 --- a/app/lib/version.rb +++ b/app/lib/version.rb @@ -3,7 +3,7 @@ module Version MAJOR = 1 MINOR = 7 - REVISION = 5 + REVISION = 6 SUFFIX = nil VERSION = "#{MAJOR}.#{MINOR}.#{REVISION}#{SUFFIX && ".#{SUFFIX}"}" end From 1860a58c4167cde665902aa4b9434c01895da0f0 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 12 Mar 2024 16:59:53 +0000 Subject: [PATCH 07/23] docs: Updated CHANGELOG --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92eb554..b638806 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ This app presents the landing page experience for landregistry.data.gov.uk, including the SPARQL Qonsole +## 1.7.6 - 2024-03-12 + +- (Jon) Reconfigured the old ppd doc routes to permanently redirect to `app/doc/ppd` + as well as set the `ppd_doc_path` variable to point to the same reconfigured + route; alongside adding tests querying the new route to ensure the route is + valid and contains the expected content as well as tests to verify the old + routes redirect with 301 permanent status + ## 1.7.5 - 2023-11-23 - (Jon) Updated the `lr_common_styles` gem to the latest 1.9.3 patch release. From 88862e6064f9f557521ed5904cd562fe6aab6612 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Wed, 13 Mar 2024 08:56:26 +0000 Subject: [PATCH 08/23] fix: reset redirects to 302 temporary as a safety precaution --- CHANGELOG.md | 4 ++-- config/routes.rb | 4 ++-- test/integration/documentation_test.rb | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b638806..b63e3d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,11 @@ including the SPARQL Qonsole ## 1.7.6 - 2024-03-12 -- (Jon) Reconfigured the old ppd doc routes to permanently redirect to `app/doc/ppd` +- (Jon) Reconfigured the old ppd doc routes to temporarily redirect to `app/doc/ppd` as well as set the `ppd_doc_path` variable to point to the same reconfigured route; alongside adding tests querying the new route to ensure the route is valid and contains the expected content as well as tests to verify the old - routes redirect with 301 permanent status + routes redirect with 302 temporary status ## 1.7.5 - 2023-11-23 diff --git a/config/routes.rb b/config/routes.rb index f475f22..2af466a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,8 +10,8 @@ get 'doc/hpi', to: 'doc#hpi', as: 'hpi_doc' get 'doc/ukhpi', to: redirect('/app/ukhpi/doc', status: 302) get 'app/doc/ppd', to: 'doc#ppd', as: 'ppd_doc' - get 'doc/ppd', to: redirect('/app/doc/ppd', status: 301) - get 'app/root/doc/ppd', to: redirect('app/doc/ppd', status: 301) + get 'doc/ppd', to: redirect('/app/doc/ppd', status: 302) + get 'app/root/doc/ppd', to: redirect('app/doc/ppd', status: 302) get 'doc/ukhpi-dsd', to: redirect('/app/ukhpi/doc/ukhpi-dsd', status: 302) get 'doc/ukhpi-user-guide', to: redirect('/app/ukhpi/doc/ukhpi-user-guide', status: 302) get 'doc/accessibility', to: 'doc#accessibility' diff --git a/test/integration/documentation_test.rb b/test/integration/documentation_test.rb index 168756c..edad6d7 100644 --- a/test/integration/documentation_test.rb +++ b/test/integration/documentation_test.rb @@ -14,14 +14,14 @@ class DocumentationTest < ActionDispatch::IntegrationTest assert_equal(302, response.status) end - test 'older PPD doc link redirects with permanent 301 status' do + test 'older PPD doc link redirects with permanent 302 status' do get '/doc/ppd' - assert_equal(301, response.status) + assert_equal(302, response.status) end - test 'old PPD doc link redirects with permanent 301 status' do + test 'old PPD doc link redirects with permanent 302 status' do get '/app/root/doc/ppd' - assert_equal(301, response.status) + assert_equal(302, response.status) end test 'ppd_doc_path variable links correctly' do From f647c60e75779f8830fae751e2a90f76bf71c14f Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Wed, 13 Mar 2024 10:17:06 +0000 Subject: [PATCH 09/23] fix: resolving too many redirections all redirections will now be handled by the proxy instead. --- config/routes.rb | 2 -- test/integration/documentation_test.rb | 10 ---------- 2 files changed, 12 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 2af466a..83bc991 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,8 +10,6 @@ get 'doc/hpi', to: 'doc#hpi', as: 'hpi_doc' get 'doc/ukhpi', to: redirect('/app/ukhpi/doc', status: 302) get 'app/doc/ppd', to: 'doc#ppd', as: 'ppd_doc' - get 'doc/ppd', to: redirect('/app/doc/ppd', status: 302) - get 'app/root/doc/ppd', to: redirect('app/doc/ppd', status: 302) get 'doc/ukhpi-dsd', to: redirect('/app/ukhpi/doc/ukhpi-dsd', status: 302) get 'doc/ukhpi-user-guide', to: redirect('/app/ukhpi/doc/ukhpi-user-guide', status: 302) get 'doc/accessibility', to: 'doc#accessibility' diff --git a/test/integration/documentation_test.rb b/test/integration/documentation_test.rb index edad6d7..6f5d519 100644 --- a/test/integration/documentation_test.rb +++ b/test/integration/documentation_test.rb @@ -14,16 +14,6 @@ class DocumentationTest < ActionDispatch::IntegrationTest assert_equal(302, response.status) end - test 'older PPD doc link redirects with permanent 302 status' do - get '/doc/ppd' - assert_equal(302, response.status) - end - - test 'old PPD doc link redirects with permanent 302 status' do - get '/app/root/doc/ppd' - assert_equal(302, response.status) - end - test 'ppd_doc_path variable links correctly' do get ppd_doc_path assert_response :success From 399e375027262f293eac1c13e2d2533276c7c17e Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Wed, 13 Mar 2024 10:19:20 +0000 Subject: [PATCH 10/23] docs: Updated CHANGELOG --- CHANGELOG.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b63e3d3..d0681f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,10 @@ including the SPARQL Qonsole ## 1.7.6 - 2024-03-12 -- (Jon) Reconfigured the old ppd doc routes to temporarily redirect to `app/doc/ppd` - as well as set the `ppd_doc_path` variable to point to the same reconfigured - route; alongside adding tests querying the new route to ensure the route is - valid and contains the expected content as well as tests to verify the old - routes redirect with 302 temporary status +- (Jon) Reconfigured the `ppd_doc_path` variable to point to the `app/doc/ppd` + path; alongside adding tests querying the new route to ensure the route is + valid and contains the expected content. All redirections for any old routes + will now handled by the proxy server. ## 1.7.5 - 2023-11-23 From 4c117e3af2a78534b5002d76b2b7ea186fe838ed Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Wed, 13 Mar 2024 13:30:18 +0000 Subject: [PATCH 11/23] revert: removes all changes from routes.rb in order to maintain all proxy settings currently in place this no longer changes the route for the `ppd_doc_path` variable --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 83bc991..fa10994 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,7 +9,7 @@ get 'landing/hpi', to: 'landing#hpi' get 'doc/hpi', to: 'doc#hpi', as: 'hpi_doc' get 'doc/ukhpi', to: redirect('/app/ukhpi/doc', status: 302) - get 'app/doc/ppd', to: 'doc#ppd', as: 'ppd_doc' + get 'doc/ppd', to: 'doc#ppd', as: 'ppd_doc' get 'doc/ukhpi-dsd', to: redirect('/app/ukhpi/doc/ukhpi-dsd', status: 302) get 'doc/ukhpi-user-guide', to: redirect('/app/ukhpi/doc/ukhpi-user-guide', status: 302) get 'doc/accessibility', to: 'doc#accessibility' From ac97baec1e7fc932258ffe60ef0af02afea32cba Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Wed, 13 Mar 2024 13:31:38 +0000 Subject: [PATCH 12/23] fix: hard-coded link paths Updates to both the english and welsh index files to set the links to an actual path instead of relying on a configuration variable. --- app/views/landing/_index_cy.html.haml | 3 +-- app/views/landing/_index_en.html.haml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/views/landing/_index_cy.html.haml b/app/views/landing/_index_cy.html.haml index aec224b..bcdadcb 100644 --- a/app/views/landing/_index_cy.html.haml +++ b/app/views/landing/_index_cy.html.haml @@ -91,8 +91,7 @@ %h3.heading-small Gwybodaeth bellach %ul.list.list-bullet %li - = link_to( ppd_doc_path ) do - dogfennaeth fanwl + = link_to('dogfennaeth fanwl', '/app/doc/ppd') am y Data Pris a Dalwyd, y model data, a defnyddio’r data. %h2#standard-reports.heading-medium Lluniwr Adroddiad Safonol diff --git a/app/views/landing/_index_en.html.haml b/app/views/landing/_index_en.html.haml index 08bb6bc..bd47045 100644 --- a/app/views/landing/_index_en.html.haml +++ b/app/views/landing/_index_en.html.haml @@ -91,8 +91,7 @@ %h3.heading-small Further information %ul.list.list-bullet %li - = link_to( ppd_doc_path ) do - detailed documentation + = link_to('detailed documentation', '/app/doc/ppd') about the Price Paid Data, the data model, and using the data. %h2#standard-reports.heading-medium Standard Report Builder From a726359e8e65649cf0a363aaf3a8f7d34595e2e5 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Wed, 13 Mar 2024 13:32:18 +0000 Subject: [PATCH 13/23] docs: Updated CHANGELOG Revised to reflect the latest approach for the ppd documentation link --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0681f9..8b11eb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,10 @@ including the SPARQL Qonsole ## 1.7.6 - 2024-03-12 -- (Jon) Reconfigured the `ppd_doc_path` variable to point to the `app/doc/ppd` - path; alongside adding tests querying the new route to ensure the route is - valid and contains the expected content. All redirections for any old routes - will now handled by the proxy server. +- (Jon) Reconfigured the `detailed documentation` links. both english and welsh + to point to the `app/doc/ppd` path; alongside adding tests querying the new + route to ensure the route is valid and contains the expected content. All + redirections for any old routes will now handled by the proxy server. ## 1.7.5 - 2023-11-23 From 31f7050c1526b374f0cd25dc4062cb7237f44b9e Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Wed, 13 Mar 2024 13:34:04 +0000 Subject: [PATCH 14/23] chore: fixed punctuation in CHANGELOG entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b11eb1..a5dca82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ including the SPARQL Qonsole ## 1.7.6 - 2024-03-12 -- (Jon) Reconfigured the `detailed documentation` links. both english and welsh +- (Jon) Reconfigured the `detailed documentation` links, both english and welsh, to point to the `app/doc/ppd` path; alongside adding tests querying the new route to ensure the route is valid and contains the expected content. All redirections for any old routes will now handled by the proxy server. From b75aa010a415eece6401ee3436ff61c38c09846d Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 30 Apr 2024 17:12:05 +0100 Subject: [PATCH 15/23] Update deployment.yaml rename `deve-infrasctructure` branch to `dev` following branch cleanup --- deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment.yaml b/deployment.yaml index 012ee5d..3b73b17 100644 --- a/deployment.yaml +++ b/deployment.yaml @@ -8,7 +8,7 @@ deployments: - branch: "preprod" deploy: "preprod" publish: "preprod" - - branch: "dev-infrastructure" + - branch: "dev" deploy: "dev" publish: "dev" - branch: "[a-zA-Z0-9]+" From 45e18271e927c12499f6c4dab64cabfae50b4b6b Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Fri, 31 May 2024 15:10:42 +0100 Subject: [PATCH 16/23] docs: updated CHANGELOG to reflect the updated date as well as the latest internal change --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5dca82..dcd2383 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,10 @@ This app presents the landing page experience for landregistry.data.gov.uk, including the SPARQL Qonsole -## 1.7.6 - 2024-03-12 +## 1.7.6 - 2024-06 +- (Jon) - Updated the deployment.yaml file to mirror the new branch names post + branch cleanup. - (Jon) Reconfigured the `detailed documentation` links, both english and welsh, to point to the `app/doc/ppd` path; alongside adding tests querying the new route to ensure the route is valid and contains the expected content. All From 779893f6fb1ac09e997a822c3e4e08a6a8ed6047 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Mon, 4 Nov 2024 15:02:21 +0000 Subject: [PATCH 17/23] Revert "Merge pull request #148 from epimorphics/dev" This reverts commit 03efce4f5ac82cbcf3132532cdc8c10935825c97, reversing changes made to 597517068f64fa4f9ee05c1810650a7f0c8bc698. --- .ruby-version | 2 +- CHANGELOG.md | 13 - Gemfile | 43 ++- Gemfile.lock | 526 ++++++++++---------------- Makefile | 2 +- app/assets/config/manifest.js | 3 - app/assets/javascripts/application.js | 9 - app/lib/version.rb | 6 +- config/initializers/sentry.rb | 2 - public/fees-calculator.html | 143 +++++++ 10 files changed, 376 insertions(+), 373 deletions(-) delete mode 100644 app/assets/config/manifest.js create mode 100644 public/fees-calculator.html diff --git a/.ruby-version b/.ruby-version index fa7adc7..338a5b5 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.5 +2.6.6 diff --git a/CHANGELOG.md b/CHANGELOG.md index 392eebe..a72e371 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,19 +3,6 @@ This app presents the landing page experience for landregistry.data.gov.uk, including the SPARQL Qonsole -## 2.0.1 - 2024-10 - -- Fixed an issue with CSS for the checkboxes in the Qonsole query form - -## 2.0.0 - 2024-10 - -- Upgraded the `qonsole-rails` and `lr_common_styles` gems to latest versions - (which are now running on latest ruby and rails versions as well) -- Upgraded rails to latest version (`7.2.1`) -- Upgraded ruby to latest version (`3.3.5`) -- (Jon) Removed the public/fees-caluclator.html file as it is no longer needed - [GH-140](https://github.com/epimorphics/lr-landing/issues/140) - ## 1.8.0 - 2024-09 - (Jon) Create a `config/initializers/load_notification_subscribers.rb` file to diff --git a/Gemfile b/Gemfile index 8e60a05..e61a083 100644 --- a/Gemfile +++ b/Gemfile @@ -2,25 +2,24 @@ source 'https://rubygems.org' -gem 'rails' - +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.4' # Use SCSS for stylesheets -gem 'sass-rails' +gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets -gem 'uglifier' +gem 'uglifier', '>= 1.3.0' + # Use jquery as the JavaScript library gem 'jquery-rails' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder' -gem 'get_process_mem' -gem 'haml-rails' +gem 'jbuilder', '~> 2.0' + +gem 'get_process_mem', '~> 0.2.7' +gem 'haml-rails', '~> 2.0.0' gem 'http_accept_language' -gem 'prometheus-client' +gem 'prometheus-client', '~> 4.0' gem 'puma' -gem 'sentry-rails' - -# TODO: Add this to the epimorphics package registry as a gem -gem 'qonsole-rails', git: 'https://github.com/epimorphics/qonsole-rails' +gem 'sentry-rails', '~> 5.2' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console @@ -34,15 +33,19 @@ group :development do gem 'web-console' end -source 'https://rubygems.pkg.github.com/epimorphics' do - gem 'json_rails_logger' - gem 'lr_common_styles' -end - # rubocop:disable Layout/LineLength # TODO: While running the rails app locally for testing you can set gems to your local path # ! These "local" paths do not work with a docker image - use the repo instead -# gem 'qonsole-rails', path: '.../qonsole-rails' -# gem 'json_rails_logger', path: '.../json-rails-logger' -# gem 'lr_common_styles', path: '.../lr_common_styles' +# gem 'qonsole-rails', path: '~/Epimorphics/clients/land-registry/projects/qonsole-rails' +# gem 'json_rails_logger', '~> 1.0.0', path: '~/Epimorphics/shared/json-rails-logger/' +# gem 'lr_common_styles', '~> 1.9.0', path: '~/Epimorphics/clients/land-registry/projects/lr_common_styles/' # rubocop:enable Layout/LineLength + +# TODO: In production you want to set this to the gem from the epimorphics github repo +gem 'qonsole-rails', git: 'https://github.com/epimorphics/qonsole-rails' + +# TODO: In production you want to set this to the gem from the epimorphics package repo +source 'https://rubygems.pkg.github.com/epimorphics' do + gem 'json_rails_logger', '~> 1.0.0' + gem 'lr_common_styles', '~> 1.9.0' +end diff --git a/Gemfile.lock b/Gemfile.lock index 7e26ae8..f484d58 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,181 +1,121 @@ GIT remote: https://github.com/epimorphics/qonsole-rails - revision: 0c78997150909e4fe84d3d902fbbfa88e1aa99d8 + revision: 40c646990549c4e8697cf177d6bc47a6ebf09b32 specs: - qonsole-rails (1.0.2) - faraday - faraday-encoding - faraday_middleware - font-awesome-rails - haml-rails - jquery-datatables-rails - jquery-rails - lodash-rails - modulejs-rails - rails + qonsole-rails (0.6.1) + codemirror-rails (~> 5.11) + faraday (~> 0.17.0) + faraday-encoding (~> 0.0.5) + faraday_middleware (~> 0.13.1) + font-awesome-rails (~> 4.7.0.1) + haml-rails (~> 2.0.0) + jquery-datatables-rails (~> 3.4.0) + jquery-rails (~> 4.3.1) + lodash-rails (~> 4.17.4) + modulejs-rails (~> 2.2.0.0) + rails (~> 5.2.4) GEM remote: https://rubygems.org/ specs: - actioncable (7.2.2) - actionpack (= 7.2.2) - activesupport (= 7.2.2) + actioncable (5.2.7) + actionpack (= 5.2.7) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - zeitwerk (~> 2.6) - actionmailbox (7.2.2) - actionpack (= 7.2.2) - activejob (= 7.2.2) - activerecord (= 7.2.2) - activestorage (= 7.2.2) - activesupport (= 7.2.2) - mail (>= 2.8.0) - actionmailer (7.2.2) - actionpack (= 7.2.2) - actionview (= 7.2.2) - activejob (= 7.2.2) - activesupport (= 7.2.2) - mail (>= 2.8.0) - rails-dom-testing (~> 2.2) - actionpack (7.2.2) - actionview (= 7.2.2) - activesupport (= 7.2.2) - nokogiri (>= 1.8.5) - racc - rack (>= 2.2.4, < 3.2) - rack-session (>= 1.0.1) + actionmailer (5.2.7) + actionpack (= 5.2.7) + actionview (= 5.2.7) + activejob (= 5.2.7) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.7) + actionview (= 5.2.7) + activesupport (= 5.2.7) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - useragent (~> 0.16) - actiontext (7.2.2) - actionpack (= 7.2.2) - activerecord (= 7.2.2) - activestorage (= 7.2.2) - activesupport (= 7.2.2) - globalid (>= 0.6.0) - nokogiri (>= 1.8.5) - actionview (7.2.2) - activesupport (= 7.2.2) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.7) + activesupport (= 5.2.7) builder (~> 3.1) - erubi (~> 1.11) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - activejob (7.2.2) - activesupport (= 7.2.2) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.7) + activesupport (= 5.2.7) globalid (>= 0.3.6) - activemodel (7.2.2) - activesupport (= 7.2.2) - activerecord (7.2.2) - activemodel (= 7.2.2) - activesupport (= 7.2.2) - timeout (>= 0.4.0) - activestorage (7.2.2) - actionpack (= 7.2.2) - activejob (= 7.2.2) - activerecord (= 7.2.2) - activesupport (= 7.2.2) - marcel (~> 1.0) - activesupport (7.2.2) - base64 - benchmark (>= 0.3) - bigdecimal - concurrent-ruby (~> 1.0, >= 1.3.1) - connection_pool (>= 2.2.5) - drb - i18n (>= 1.6, < 2) - logger (>= 1.4.2) - minitest (>= 5.1) - securerandom (>= 0.3) - tzinfo (~> 2.0, >= 2.0.5) + activemodel (5.2.7) + activesupport (= 5.2.7) + activerecord (5.2.7) + activemodel (= 5.2.7) + activesupport (= 5.2.7) + arel (>= 9.0) + activestorage (5.2.7) + actionpack (= 5.2.7) + activerecord (= 5.2.7) + marcel (~> 1.0.0) + activesupport (5.2.7) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + arel (9.0.0) ast (2.4.2) autoprefixer-rails (10.4.19.0) execjs (~> 2) - base64 (0.2.0) - benchmark (0.3.0) - bigdecimal (3.1.8) bindex (0.8.1) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) - builder (3.3.0) + builder (3.2.4) byebug (11.1.3) - concurrent-ruby (1.3.4) - connection_pool (2.4.1) + codemirror-rails (5.16.0) + railties (>= 3.0, < 6.0) + concurrent-ruby (1.1.10) crass (1.0.6) - date (3.4.0) - drb (2.2.1) - erubi (1.13.0) - execjs (2.10.0) - faraday (1.10.4) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-encoding (0.0.6) + erubi (1.10.0) + erubis (2.7.0) + execjs (2.8.1) + faraday (0.17.6) + multipart-post (>= 1.2, < 3) + faraday-encoding (0.0.5) faraday - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.2) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - faraday_middleware (1.2.1) - faraday (~> 1.0) - ffi (1.17.0-aarch64-linux-gnu) - ffi (1.17.0-aarch64-linux-musl) - ffi (1.17.0-arm-linux-gnu) - ffi (1.17.0-arm-linux-musl) - ffi (1.17.0-arm64-darwin) - ffi (1.17.0-x86-linux-gnu) - ffi (1.17.0-x86-linux-musl) - ffi (1.17.0-x86_64-darwin) - ffi (1.17.0-x86_64-linux-gnu) - ffi (1.17.0-x86_64-linux-musl) + faraday_middleware (0.13.1) + faraday (>= 0.7.4, < 1.0) + ffi (1.15.5) font-awesome-rails (4.7.0.8) railties (>= 3.2, < 8.0) - get_process_mem (1.0.0) - bigdecimal (>= 2.0) + get_process_mem (0.2.7) ffi (~> 1.0) - globalid (1.2.1) - activesupport (>= 6.1) - govuk_elements_rails (3.0.2) - govuk_frontend_toolkit (>= 5.2.0) + globalid (1.0.1) + activesupport (>= 5.0) + govuk_elements_rails (2.0.0) + govuk_frontend_toolkit (>= 4.14.1) rails (>= 4.1.0) sass (>= 3.2.0) - govuk_frontend_toolkit (9.0.1) - railties (>= 3.1.0) - govuk_template (0.26.0) + govuk_frontend_toolkit (4.18.4) + rails (>= 3.1.0) + sass (>= 3.2.0) + govuk_template (0.18.3) rails (>= 3.1) - haml (6.3.0) - temple (>= 0.8.2) - thor + haml (5.2.2) + temple (>= 0.8.0) tilt - haml-rails (2.1.0) + haml-rails (2.0.1) actionpack (>= 5.1) activesupport (>= 5.1) - haml (>= 4.0.6) + haml (>= 4.0.6, < 6.0) + html2haml (>= 1.0.1) railties (>= 5.1) + html2haml (2.2.0) + erubis (~> 2.7.0) + haml (>= 4.0, < 6) + nokogiri (>= 1.6.0) + ruby_parser (~> 3.5) http_accept_language (2.1.1) - i18n (1.14.6) + i18n (1.12.0) concurrent-ruby (~> 1.0) - io-console (0.7.2) - irb (1.14.1) - rdoc (>= 4.0.0) - reline (>= 0.4.2) - jbuilder (2.13.0) + jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) jquery-datatables-rails (3.4.0) @@ -183,243 +123,187 @@ GEM jquery-rails railties (>= 3.1) sass-rails - jquery-rails (4.6.0) + jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.7.2) - language_server-protocol (3.17.0.3) + json (2.6.3) lodash-rails (4.17.21) railties (>= 3.1) - logger (1.6.1) - lograge (0.14.0) + lograge (0.12.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.23.1) + loofah (2.19.1) crass (~> 1.0.2) - nokogiri (>= 1.12.0) - mail (2.8.1) + nokogiri (>= 1.5.9) + mail (2.7.1) mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp - marcel (1.0.4) - mini_mime (1.1.5) - minitest (5.25.1) + marcel (1.0.2) + method_source (1.0.0) + mini_mime (1.1.2) + minitest (5.17.0) modernizr-rails (2.7.1) modulejs-rails (2.2.0.0) railties (>= 4.0) - multipart-post (2.4.1) - net-imap (0.5.0) - date - net-protocol - net-pop (0.1.2) - net-protocol - net-protocol (0.2.2) - timeout - net-smtp (0.5.0) - net-protocol - nio4r (2.7.4) - nokogiri (1.16.7-aarch64-linux) - racc (~> 1.4) - nokogiri (1.16.7-arm-linux) - racc (~> 1.4) - nokogiri (1.16.7-arm64-darwin) - racc (~> 1.4) - nokogiri (1.16.7-x86-linux) - racc (~> 1.4) - nokogiri (1.16.7-x86_64-darwin) + multipart-post (2.3.0) + nio4r (2.5.9) + nokogiri (1.13.10-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.7-x86_64-linux) + nokogiri (1.13.10-x86_64-linux) racc (~> 1.4) - parallel (1.26.3) - parser (3.3.5.0) + parallel (1.22.1) + parser (3.1.1.0) ast (~> 2.4.1) - racc - prometheus-client (4.2.3) - base64 - psych (5.1.2) - stringio - puma (6.4.3) + prometheus-client (4.0.0) + puma (6.4.2) nio4r (~> 2.0) - racc (1.8.1) - rack (3.1.8) - rack-session (2.0.0) - rack (>= 3.0.0) - rack-test (2.1.0) - rack (>= 1.3) - rackup (2.1.0) - rack (>= 3) - webrick (~> 1.8) - rails (7.2.2) - actioncable (= 7.2.2) - actionmailbox (= 7.2.2) - actionmailer (= 7.2.2) - actionpack (= 7.2.2) - actiontext (= 7.2.2) - actionview (= 7.2.2) - activejob (= 7.2.2) - activemodel (= 7.2.2) - activerecord (= 7.2.2) - activestorage (= 7.2.2) - activesupport (= 7.2.2) - bundler (>= 1.15.0) - railties (= 7.2.2) - rails-dom-testing (2.2.0) - activesupport (>= 5.0.0) - minitest + racc (1.6.2) + rack (2.2.8) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.7) + actioncable (= 5.2.7) + actionmailer (= 5.2.7) + actionpack (= 5.2.7) + actionview (= 5.2.7) + activejob (= 5.2.7) + activemodel (= 5.2.7) + activerecord (= 5.2.7) + activestorage (= 5.2.7) + activesupport (= 5.2.7) + bundler (>= 1.3.0) + railties (= 5.2.7) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - railties (7.2.2) - actionpack (= 7.2.2) - activesupport (= 7.2.2) - irb (~> 1.13) - rackup (>= 1.0.0) - rake (>= 12.2) - thor (~> 1.0, >= 1.2.2) - zeitwerk (~> 2.6) + rails-html-sanitizer (1.4.4) + loofah (~> 2.19, >= 2.19.1) + railties (5.2.7) + actionpack (= 5.2.7) + activesupport (= 5.2.7) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) rainbow (3.1.1) - rake (13.2.1) - rb-fsevent (0.11.2) - rb-inotify (0.11.1) + rake (13.0.6) + rb-fsevent (0.11.1) + rb-inotify (0.10.1) ffi (~> 1.0) - rdoc (6.7.0) - psych (>= 4.0.0) - regexp_parser (2.9.2) - reline (0.5.10) - io-console (~> 0.5) - request_store (1.7.0) + regexp_parser (2.2.1) + request_store (1.5.1) rack (>= 1.4) - rubocop (1.67.0) - json (~> 2.3) - language_server-protocol (>= 3.17.0) + rexml (3.2.5) + rubocop (1.26.1) parallel (~> 1.10) - parser (>= 3.3.0.2) + parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 2.4, < 3.0) - rubocop-ast (>= 1.32.2, < 2.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.16.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.32.3) - parser (>= 3.3.1.0) - rubocop-rails (2.26.2) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.16.0) + parser (>= 3.1.1.0) + rubocop-rails (2.14.2) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.52.0, < 2.0) - rubocop-ast (>= 1.31.1, < 2.0) - ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) + rubocop (>= 1.7.0, < 2.0) + ruby-progressbar (1.11.0) + ruby_parser (3.19.0) + sexp_processor (~> 4.16) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (6.0.0) - sassc-rails (~> 2.1, >= 2.1.1) + sass-rails (5.0.8) + railties (>= 5.2.0) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) sassc (2.4.0) ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt - securerandom (0.3.1) - sentry-rails (5.21.0) + sentry-rails (5.2.1) railties (>= 5.0) - sentry-ruby (~> 5.21.0) - sentry-ruby (5.21.0) - bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) - sprockets (4.2.1) + sentry-ruby-core (~> 5.2.1) + sentry-ruby-core (5.2.1) + concurrent-ruby + sexp_processor (4.16.0) + sprockets (3.7.2) concurrent-ruby (~> 1.0) - rack (>= 2.2.4, < 4) - sprockets-rails (3.5.2) - actionpack (>= 6.1) - activesupport (>= 6.1) + rack (> 1, < 3) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) - stringio (3.1.1) - temple (0.10.3) - thor (1.3.2) - tilt (2.4.0) - timeout (0.4.1) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - uglifier (4.2.1) + temple (0.8.2) + thor (1.2.2) + thread_safe (0.3.6) + tilt (2.0.10) + tzinfo (1.2.11) + thread_safe (~> 0.1) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (2.6.0) - useragent (0.16.10) - web-console (4.2.1) - actionview (>= 6.0.0) - activemodel (>= 6.0.0) + unicode-display_width (2.1.0) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) bindex (>= 0.4.0) - railties (>= 6.0.0) - webrick (1.9.0) - websocket-driver (0.7.6) + railties (>= 5.0) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.7.1) GEM remote: https://rubygems.pkg.github.com/epimorphics/ specs: - json_rails_logger (1.0.3) + json_rails_logger (1.0.1) json lograge railties - lr_common_styles (2.1.3) - bootstrap-sass - font-awesome-rails - govuk_elements_rails (= 3.0.2) - govuk_frontend_toolkit - govuk_template - haml-rails - jquery-rails - lodash-rails - modernizr-rails - modulejs-rails - rails - sass-rails + lr_common_styles (1.9.9) + bootstrap-sass (~> 3.4.0) + font-awesome-rails (~> 4.7.0.1) + govuk_elements_rails (~> 2.0.0) + govuk_frontend_toolkit (~> 4.18.1) + govuk_template (~> 0.18.1) + haml-rails (~> 2.0.0) + jquery-rails (>= 4.3.5, < 4.7.0) + lodash-rails (~> 4.17.14) + modernizr-rails (~> 2.7.1) + modulejs-rails (~> 2.2.0.0) + rails (~> 5.2.4) + sass-rails (~> 5.0.4) PLATFORMS - aarch64-linux - aarch64-linux-gnu - aarch64-linux-musl - arm-linux - arm-linux-gnu - arm-linux-musl - arm64-darwin - x86-linux - x86-linux-gnu - x86-linux-musl - x86_64-darwin + x86_64-darwin-17 + x86_64-darwin-21 + x86_64-darwin-22 x86_64-linux - x86_64-linux-gnu - x86_64-linux-musl DEPENDENCIES byebug - get_process_mem - haml-rails + get_process_mem (~> 0.2.7) + haml-rails (~> 2.0.0) http_accept_language - jbuilder + jbuilder (~> 2.0) jquery-rails - json_rails_logger! - lr_common_styles! - prometheus-client + json_rails_logger (~> 1.0.0)! + lr_common_styles (~> 1.9.0)! + prometheus-client (~> 4.0) puma qonsole-rails! - rails + rails (~> 5.2.4) rubocop rubocop-rails - sass-rails - sentry-rails - uglifier + sass-rails (~> 5.0) + sentry-rails (~> 5.2) + uglifier (>= 1.3.0) web-console BUNDLED WITH - 2.5.20 + 2.4.8 diff --git a/Makefile b/Makefile index c87c2f3..a8aa0c4 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: assets auth check clean image lint local publish realclean run tag test vars ACCOUNT?=$(shell aws sts get-caller-identity | jq -r .Account) -ALPINE_VERSION?=3.20 +ALPINE_VERSION?=3.13 AWS_REGION?=eu-west-1 BUNDLER_VERSION?=$(shell tail -1 Gemfile.lock | tr -d ' ') ECR?=${ACCOUNT}.dkr.ecr.eu-west-1.amazonaws.com diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js deleted file mode 100644 index b16e53d..0000000 --- a/app/assets/config/manifest.js +++ /dev/null @@ -1,3 +0,0 @@ -//= link_tree ../images -//= link_directory ../javascripts .js -//= link_directory ../stylesheets .css diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 785ef0d..8d0fccf 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -16,12 +16,3 @@ //= require lodash //= require qonsole_rails/application //= require lr_common_styles/application - -// LR Common Styles specific -//= link favicon/apple-touch-icon.png -//= link favicon/favicon-32x32.png -//= link favicon/favicon-16x16.png -//= link favicon/manifest.json -//= link favicon/safari-pinned-tab.svg -//= link favicon/favicon.ico -//= link favicon/browserconfig.xml diff --git a/app/lib/version.rb b/app/lib/version.rb index 9438a94..38bc7ca 100644 --- a/app/lib/version.rb +++ b/app/lib/version.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true module Version - MAJOR = 2 - MINOR = 0 - REVISION = 1 + MAJOR = 1 + MINOR = 8 + REVISION = 0 SUFFIX = nil VERSION = "#{MAJOR}.#{MINOR}.#{REVISION}#{SUFFIX && ".#{SUFFIX}"}" end diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb index ef5ff1d..ae6a3ce 100644 --- a/config/initializers/sentry.rb +++ b/config/initializers/sentry.rb @@ -1,7 +1,5 @@ # frozen-string-literal: true -require 'version' - if ENV['SENTRY_API_KEY'] Sentry.init do |config| config.dsn = ENV['SENTRY_API_KEY'] diff --git a/public/fees-calculator.html b/public/fees-calculator.html new file mode 100644 index 0000000..6e666d4 --- /dev/null +++ b/public/fees-calculator.html @@ -0,0 +1,143 @@ + + + + Fees Calculator + + + + + + + + + + + + + + + + +
+
+ + +
+ HM Land Registry logo +
+

Fee calculator 

+ +
+
+ Choose an application type to view the corresponding fee: + + +
+
+

You have chosen:

+

+
+
+

Enter the transaction value to the nearest £ (eg 49750).

+

Sorry only blank or numerical values are accepted.

+ + +

The fee will be assessed on this value even if no transaction takes place. If you are unsure how to assess the transaction value, please consult the relevant section of the Fee Order Link opens in a new window (external website).

+

Where VAT is payable, scale fees must be paid on the VAT, inclusive consideration or rent.

+
+
+

Enter the transaction value to the nearest £ (eg 49750).

+

Sorry only blank or numerical values are accepted.

+ + +

The fee will be assessed on the value of the land. Do not use any consideration paid in the transfer. If you are unsure how to assess the transaction value, please consult the relevant section of the Fee Order Link opens in a new window (external website).

+
+
+ AND/OR +
+

Enter the rent payable

+

Sorry only blank or numerical values are accepted.

+ + +

Rent payable is the largest amount of annual rent the lease reserves within the first five years of its term, quantified at the time of application.

+
+
+
+ Is this a Voluntary Application? + + + + +
+
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + + +
Application type

Applicable fee scale

Stated value +

+

This value is based on the transaction value and/or the rent payable.

+

You entered either £0 or an invalid transaction value so £0 has been assumed. To enter a new value click ‘Start again’ below.

+

You entered either £0 or an invalid rent payable so £0 has been assumed. To enter a new value click ‘Start again’ below.

+

You entered either £0 or an invalid transaction value and rent payable so £0 for both has been assumed. To enter a new value click ‘Start again’ below.

+
Standard Fee +

+

(This figure includes a voluntary application reduction.)

+
Electronic Fee +

+
+
+

Notes

+

+
+

Find out about how to pay Land Registry fees Link opens in a new window (external website).

+

Please note reduced fees for electronic applications only apply to Dealings of Whole.

+

This application can be submitted electronically, however please note reduced fees for electronic applications only apply to applications affecting the whole of a registered title.

+

This application can be submitted electronically.

+
+ +
+
+
+
+ + +
+
+
+
+ + From 15b3e317152dae2f1b56e62389334d1e28f93273 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Mon, 4 Nov 2024 15:22:34 +0000 Subject: [PATCH 18/23] Reapply "Merge pull request #148 from epimorphics/dev" This reverts commit 779893f6fb1ac09e997a822c3e4e08a6a8ed6047. --- .ruby-version | 2 +- CHANGELOG.md | 13 + Gemfile | 43 +-- Gemfile.lock | 526 ++++++++++++++++---------- Makefile | 2 +- app/assets/config/manifest.js | 3 + app/assets/javascripts/application.js | 9 + app/lib/version.rb | 6 +- config/initializers/sentry.rb | 2 + public/fees-calculator.html | 143 ------- 10 files changed, 373 insertions(+), 376 deletions(-) create mode 100644 app/assets/config/manifest.js delete mode 100644 public/fees-calculator.html diff --git a/.ruby-version b/.ruby-version index 338a5b5..fa7adc7 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.6 +3.3.5 diff --git a/CHANGELOG.md b/CHANGELOG.md index a72e371..392eebe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ This app presents the landing page experience for landregistry.data.gov.uk, including the SPARQL Qonsole +## 2.0.1 - 2024-10 + +- Fixed an issue with CSS for the checkboxes in the Qonsole query form + +## 2.0.0 - 2024-10 + +- Upgraded the `qonsole-rails` and `lr_common_styles` gems to latest versions + (which are now running on latest ruby and rails versions as well) +- Upgraded rails to latest version (`7.2.1`) +- Upgraded ruby to latest version (`3.3.5`) +- (Jon) Removed the public/fees-caluclator.html file as it is no longer needed + [GH-140](https://github.com/epimorphics/lr-landing/issues/140) + ## 1.8.0 - 2024-09 - (Jon) Create a `config/initializers/load_notification_subscribers.rb` file to diff --git a/Gemfile b/Gemfile index e61a083..8e60a05 100644 --- a/Gemfile +++ b/Gemfile @@ -2,24 +2,25 @@ source 'https://rubygems.org' -# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 5.2.4' +gem 'rails' + # Use SCSS for stylesheets -gem 'sass-rails', '~> 5.0' +gem 'sass-rails' # Use Uglifier as compressor for JavaScript assets -gem 'uglifier', '>= 1.3.0' - +gem 'uglifier' # Use jquery as the JavaScript library gem 'jquery-rails' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 2.0' - -gem 'get_process_mem', '~> 0.2.7' -gem 'haml-rails', '~> 2.0.0' +gem 'jbuilder' +gem 'get_process_mem' +gem 'haml-rails' gem 'http_accept_language' -gem 'prometheus-client', '~> 4.0' +gem 'prometheus-client' gem 'puma' -gem 'sentry-rails', '~> 5.2' +gem 'sentry-rails' + +# TODO: Add this to the epimorphics package registry as a gem +gem 'qonsole-rails', git: 'https://github.com/epimorphics/qonsole-rails' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console @@ -33,19 +34,15 @@ group :development do gem 'web-console' end +source 'https://rubygems.pkg.github.com/epimorphics' do + gem 'json_rails_logger' + gem 'lr_common_styles' +end + # rubocop:disable Layout/LineLength # TODO: While running the rails app locally for testing you can set gems to your local path # ! These "local" paths do not work with a docker image - use the repo instead -# gem 'qonsole-rails', path: '~/Epimorphics/clients/land-registry/projects/qonsole-rails' -# gem 'json_rails_logger', '~> 1.0.0', path: '~/Epimorphics/shared/json-rails-logger/' -# gem 'lr_common_styles', '~> 1.9.0', path: '~/Epimorphics/clients/land-registry/projects/lr_common_styles/' +# gem 'qonsole-rails', path: '.../qonsole-rails' +# gem 'json_rails_logger', path: '.../json-rails-logger' +# gem 'lr_common_styles', path: '.../lr_common_styles' # rubocop:enable Layout/LineLength - -# TODO: In production you want to set this to the gem from the epimorphics github repo -gem 'qonsole-rails', git: 'https://github.com/epimorphics/qonsole-rails' - -# TODO: In production you want to set this to the gem from the epimorphics package repo -source 'https://rubygems.pkg.github.com/epimorphics' do - gem 'json_rails_logger', '~> 1.0.0' - gem 'lr_common_styles', '~> 1.9.0' -end diff --git a/Gemfile.lock b/Gemfile.lock index f484d58..7e26ae8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,121 +1,181 @@ GIT remote: https://github.com/epimorphics/qonsole-rails - revision: 40c646990549c4e8697cf177d6bc47a6ebf09b32 + revision: 0c78997150909e4fe84d3d902fbbfa88e1aa99d8 specs: - qonsole-rails (0.6.1) - codemirror-rails (~> 5.11) - faraday (~> 0.17.0) - faraday-encoding (~> 0.0.5) - faraday_middleware (~> 0.13.1) - font-awesome-rails (~> 4.7.0.1) - haml-rails (~> 2.0.0) - jquery-datatables-rails (~> 3.4.0) - jquery-rails (~> 4.3.1) - lodash-rails (~> 4.17.4) - modulejs-rails (~> 2.2.0.0) - rails (~> 5.2.4) + qonsole-rails (1.0.2) + faraday + faraday-encoding + faraday_middleware + font-awesome-rails + haml-rails + jquery-datatables-rails + jquery-rails + lodash-rails + modulejs-rails + rails GEM remote: https://rubygems.org/ specs: - actioncable (5.2.7) - actionpack (= 5.2.7) + actioncable (7.2.2) + actionpack (= 7.2.2) + activesupport (= 7.2.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.7) - actionpack (= 5.2.7) - actionview (= 5.2.7) - activejob (= 5.2.7) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (5.2.7) - actionview (= 5.2.7) - activesupport (= 5.2.7) - rack (~> 2.0, >= 2.0.8) + zeitwerk (~> 2.6) + actionmailbox (7.2.2) + actionpack (= 7.2.2) + activejob (= 7.2.2) + activerecord (= 7.2.2) + activestorage (= 7.2.2) + activesupport (= 7.2.2) + mail (>= 2.8.0) + actionmailer (7.2.2) + actionpack (= 7.2.2) + actionview (= 7.2.2) + activejob (= 7.2.2) + activesupport (= 7.2.2) + mail (>= 2.8.0) + rails-dom-testing (~> 2.2) + actionpack (7.2.2) + actionview (= 7.2.2) + activesupport (= 7.2.2) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4, < 3.2) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.7) - activesupport (= 5.2.7) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) + actiontext (7.2.2) + actionpack (= 7.2.2) + activerecord (= 7.2.2) + activestorage (= 7.2.2) + activesupport (= 7.2.2) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.2.2) + activesupport (= 7.2.2) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.7) - activesupport (= 5.2.7) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.2.2) + activesupport (= 7.2.2) globalid (>= 0.3.6) - activemodel (5.2.7) - activesupport (= 5.2.7) - activerecord (5.2.7) - activemodel (= 5.2.7) - activesupport (= 5.2.7) - arel (>= 9.0) - activestorage (5.2.7) - actionpack (= 5.2.7) - activerecord (= 5.2.7) - marcel (~> 1.0.0) - activesupport (5.2.7) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - arel (9.0.0) + activemodel (7.2.2) + activesupport (= 7.2.2) + activerecord (7.2.2) + activemodel (= 7.2.2) + activesupport (= 7.2.2) + timeout (>= 0.4.0) + activestorage (7.2.2) + actionpack (= 7.2.2) + activejob (= 7.2.2) + activerecord (= 7.2.2) + activesupport (= 7.2.2) + marcel (~> 1.0) + activesupport (7.2.2) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) ast (2.4.2) autoprefixer-rails (10.4.19.0) execjs (~> 2) + base64 (0.2.0) + benchmark (0.3.0) + bigdecimal (3.1.8) bindex (0.8.1) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) - builder (3.2.4) + builder (3.3.0) byebug (11.1.3) - codemirror-rails (5.16.0) - railties (>= 3.0, < 6.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.3.4) + connection_pool (2.4.1) crass (1.0.6) - erubi (1.10.0) - erubis (2.7.0) - execjs (2.8.1) - faraday (0.17.6) - multipart-post (>= 1.2, < 3) - faraday-encoding (0.0.5) + date (3.4.0) + drb (2.2.1) + erubi (1.13.0) + execjs (2.10.0) + faraday (1.10.4) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-encoding (0.0.6) faraday - faraday_middleware (0.13.1) - faraday (>= 0.7.4, < 1.0) - ffi (1.15.5) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.2) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.1) + faraday (~> 1.0) + ffi (1.17.0-aarch64-linux-gnu) + ffi (1.17.0-aarch64-linux-musl) + ffi (1.17.0-arm-linux-gnu) + ffi (1.17.0-arm-linux-musl) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86-linux-gnu) + ffi (1.17.0-x86-linux-musl) + ffi (1.17.0-x86_64-darwin) + ffi (1.17.0-x86_64-linux-gnu) + ffi (1.17.0-x86_64-linux-musl) font-awesome-rails (4.7.0.8) railties (>= 3.2, < 8.0) - get_process_mem (0.2.7) + get_process_mem (1.0.0) + bigdecimal (>= 2.0) ffi (~> 1.0) - globalid (1.0.1) - activesupport (>= 5.0) - govuk_elements_rails (2.0.0) - govuk_frontend_toolkit (>= 4.14.1) + globalid (1.2.1) + activesupport (>= 6.1) + govuk_elements_rails (3.0.2) + govuk_frontend_toolkit (>= 5.2.0) rails (>= 4.1.0) sass (>= 3.2.0) - govuk_frontend_toolkit (4.18.4) - rails (>= 3.1.0) - sass (>= 3.2.0) - govuk_template (0.18.3) + govuk_frontend_toolkit (9.0.1) + railties (>= 3.1.0) + govuk_template (0.26.0) rails (>= 3.1) - haml (5.2.2) - temple (>= 0.8.0) + haml (6.3.0) + temple (>= 0.8.2) + thor tilt - haml-rails (2.0.1) + haml-rails (2.1.0) actionpack (>= 5.1) activesupport (>= 5.1) - haml (>= 4.0.6, < 6.0) - html2haml (>= 1.0.1) + haml (>= 4.0.6) railties (>= 5.1) - html2haml (2.2.0) - erubis (~> 2.7.0) - haml (>= 4.0, < 6) - nokogiri (>= 1.6.0) - ruby_parser (~> 3.5) http_accept_language (2.1.1) - i18n (1.12.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) - jbuilder (2.11.5) + io-console (0.7.2) + irb (1.14.1) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + jbuilder (2.13.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) jquery-datatables-rails (3.4.0) @@ -123,187 +183,243 @@ GEM jquery-rails railties (>= 3.1) sass-rails - jquery-rails (4.3.5) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.6.3) + json (2.7.2) + language_server-protocol (3.17.0.3) lodash-rails (4.17.21) railties (>= 3.1) - lograge (0.12.0) + logger (1.6.1) + lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.19.1) + loofah (2.23.1) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) - marcel (1.0.2) - method_source (1.0.0) - mini_mime (1.1.2) - minitest (5.17.0) + net-imap + net-pop + net-smtp + marcel (1.0.4) + mini_mime (1.1.5) + minitest (5.25.1) modernizr-rails (2.7.1) modulejs-rails (2.2.0.0) railties (>= 4.0) - multipart-post (2.3.0) - nio4r (2.5.9) - nokogiri (1.13.10-x86_64-darwin) + multipart-post (2.4.1) + net-imap (0.5.0) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.5.0) + net-protocol + nio4r (2.7.4) + nokogiri (1.16.7-aarch64-linux) + racc (~> 1.4) + nokogiri (1.16.7-arm-linux) + racc (~> 1.4) + nokogiri (1.16.7-arm64-darwin) + racc (~> 1.4) + nokogiri (1.16.7-x86-linux) + racc (~> 1.4) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.13.10-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - parallel (1.22.1) - parser (3.1.1.0) + parallel (1.26.3) + parser (3.3.5.0) ast (~> 2.4.1) - prometheus-client (4.0.0) - puma (6.4.2) + racc + prometheus-client (4.2.3) + base64 + psych (5.1.2) + stringio + puma (6.4.3) nio4r (~> 2.0) - racc (1.6.2) - rack (2.2.8) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (5.2.7) - actioncable (= 5.2.7) - actionmailer (= 5.2.7) - actionpack (= 5.2.7) - actionview (= 5.2.7) - activejob (= 5.2.7) - activemodel (= 5.2.7) - activerecord (= 5.2.7) - activestorage (= 5.2.7) - activesupport (= 5.2.7) - bundler (>= 1.3.0) - railties (= 5.2.7) - sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + racc (1.8.1) + rack (3.1.8) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails (7.2.2) + actioncable (= 7.2.2) + actionmailbox (= 7.2.2) + actionmailer (= 7.2.2) + actionpack (= 7.2.2) + actiontext (= 7.2.2) + actionview (= 7.2.2) + activejob (= 7.2.2) + activemodel (= 7.2.2) + activerecord (= 7.2.2) + activestorage (= 7.2.2) + activesupport (= 7.2.2) + bundler (>= 1.15.0) + railties (= 7.2.2) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) - loofah (~> 2.19, >= 2.19.1) - railties (5.2.7) - actionpack (= 5.2.7) - activesupport (= 5.2.7) - method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.2.2) + actionpack (= 7.2.2) + activesupport (= 7.2.2) + irb (~> 1.13) + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rainbow (3.1.1) - rake (13.0.6) - rb-fsevent (0.11.1) - rb-inotify (0.10.1) + rake (13.2.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) - regexp_parser (2.2.1) - request_store (1.5.1) + rdoc (6.7.0) + psych (>= 4.0.0) + regexp_parser (2.9.2) + reline (0.5.10) + io-console (~> 0.5) + request_store (1.7.0) rack (>= 1.4) - rexml (3.2.5) - rubocop (1.26.1) + rubocop (1.67.0) + json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.16.0, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.16.0) - parser (>= 3.1.1.0) - rubocop-rails (2.14.2) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.32.3) + parser (>= 3.3.1.0) + rubocop-rails (2.26.2) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.7.0, < 2.0) - ruby-progressbar (1.11.0) - ruby_parser (3.19.0) - sexp_processor (~> 4.16) + rubocop (>= 1.52.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.8) - railties (>= 5.2.0) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) sassc (2.4.0) ffi (~> 1.9) - sentry-rails (5.2.1) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + securerandom (0.3.1) + sentry-rails (5.21.0) railties (>= 5.0) - sentry-ruby-core (~> 5.2.1) - sentry-ruby-core (5.2.1) - concurrent-ruby - sexp_processor (4.16.0) - sprockets (3.7.2) + sentry-ruby (~> 5.21.0) + sentry-ruby (5.21.0) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + sprockets (4.2.1) concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + rack (>= 2.2.4, < 4) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) - temple (0.8.2) - thor (1.2.2) - thread_safe (0.3.6) - tilt (2.0.10) - tzinfo (1.2.11) - thread_safe (~> 0.1) - uglifier (4.2.0) + stringio (3.1.1) + temple (0.10.3) + thor (1.3.2) + tilt (2.4.0) + timeout (0.4.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + uglifier (4.2.1) execjs (>= 0.3.0, < 3) - unicode-display_width (2.1.0) - web-console (3.7.0) - actionview (>= 5.0) - activemodel (>= 5.0) + unicode-display_width (2.6.0) + useragent (0.16.10) + web-console (4.2.1) + actionview (>= 6.0.0) + activemodel (>= 6.0.0) bindex (>= 0.4.0) - railties (>= 5.0) - websocket-driver (0.7.5) + railties (>= 6.0.0) + webrick (1.9.0) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) + zeitwerk (2.7.1) GEM remote: https://rubygems.pkg.github.com/epimorphics/ specs: - json_rails_logger (1.0.1) + json_rails_logger (1.0.3) json lograge railties - lr_common_styles (1.9.9) - bootstrap-sass (~> 3.4.0) - font-awesome-rails (~> 4.7.0.1) - govuk_elements_rails (~> 2.0.0) - govuk_frontend_toolkit (~> 4.18.1) - govuk_template (~> 0.18.1) - haml-rails (~> 2.0.0) - jquery-rails (>= 4.3.5, < 4.7.0) - lodash-rails (~> 4.17.14) - modernizr-rails (~> 2.7.1) - modulejs-rails (~> 2.2.0.0) - rails (~> 5.2.4) - sass-rails (~> 5.0.4) + lr_common_styles (2.1.3) + bootstrap-sass + font-awesome-rails + govuk_elements_rails (= 3.0.2) + govuk_frontend_toolkit + govuk_template + haml-rails + jquery-rails + lodash-rails + modernizr-rails + modulejs-rails + rails + sass-rails PLATFORMS - x86_64-darwin-17 - x86_64-darwin-21 - x86_64-darwin-22 + aarch64-linux + aarch64-linux-gnu + aarch64-linux-musl + arm-linux + arm-linux-gnu + arm-linux-musl + arm64-darwin + x86-linux + x86-linux-gnu + x86-linux-musl + x86_64-darwin x86_64-linux + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES byebug - get_process_mem (~> 0.2.7) - haml-rails (~> 2.0.0) + get_process_mem + haml-rails http_accept_language - jbuilder (~> 2.0) + jbuilder jquery-rails - json_rails_logger (~> 1.0.0)! - lr_common_styles (~> 1.9.0)! - prometheus-client (~> 4.0) + json_rails_logger! + lr_common_styles! + prometheus-client puma qonsole-rails! - rails (~> 5.2.4) + rails rubocop rubocop-rails - sass-rails (~> 5.0) - sentry-rails (~> 5.2) - uglifier (>= 1.3.0) + sass-rails + sentry-rails + uglifier web-console BUNDLED WITH - 2.4.8 + 2.5.20 diff --git a/Makefile b/Makefile index a8aa0c4..c87c2f3 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: assets auth check clean image lint local publish realclean run tag test vars ACCOUNT?=$(shell aws sts get-caller-identity | jq -r .Account) -ALPINE_VERSION?=3.13 +ALPINE_VERSION?=3.20 AWS_REGION?=eu-west-1 BUNDLER_VERSION?=$(shell tail -1 Gemfile.lock | tr -d ' ') ECR?=${ACCOUNT}.dkr.ecr.eu-west-1.amazonaws.com diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 0000000..b16e53d --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 8d0fccf..785ef0d 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -16,3 +16,12 @@ //= require lodash //= require qonsole_rails/application //= require lr_common_styles/application + +// LR Common Styles specific +//= link favicon/apple-touch-icon.png +//= link favicon/favicon-32x32.png +//= link favicon/favicon-16x16.png +//= link favicon/manifest.json +//= link favicon/safari-pinned-tab.svg +//= link favicon/favicon.ico +//= link favicon/browserconfig.xml diff --git a/app/lib/version.rb b/app/lib/version.rb index 38bc7ca..9438a94 100644 --- a/app/lib/version.rb +++ b/app/lib/version.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true module Version - MAJOR = 1 - MINOR = 8 - REVISION = 0 + MAJOR = 2 + MINOR = 0 + REVISION = 1 SUFFIX = nil VERSION = "#{MAJOR}.#{MINOR}.#{REVISION}#{SUFFIX && ".#{SUFFIX}"}" end diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb index ae6a3ce..ef5ff1d 100644 --- a/config/initializers/sentry.rb +++ b/config/initializers/sentry.rb @@ -1,5 +1,7 @@ # frozen-string-literal: true +require 'version' + if ENV['SENTRY_API_KEY'] Sentry.init do |config| config.dsn = ENV['SENTRY_API_KEY'] diff --git a/public/fees-calculator.html b/public/fees-calculator.html deleted file mode 100644 index 6e666d4..0000000 --- a/public/fees-calculator.html +++ /dev/null @@ -1,143 +0,0 @@ - - - - Fees Calculator - - - - - - - - - - - - - - - - -
-
- - -
- HM Land Registry logo -
-

Fee calculator 

- -
-
- Choose an application type to view the corresponding fee: - - -
-
-

You have chosen:

-

-
-
-

Enter the transaction value to the nearest £ (eg 49750).

-

Sorry only blank or numerical values are accepted.

- - -

The fee will be assessed on this value even if no transaction takes place. If you are unsure how to assess the transaction value, please consult the relevant section of the Fee Order Link opens in a new window (external website).

-

Where VAT is payable, scale fees must be paid on the VAT, inclusive consideration or rent.

-
-
-

Enter the transaction value to the nearest £ (eg 49750).

-

Sorry only blank or numerical values are accepted.

- - -

The fee will be assessed on the value of the land. Do not use any consideration paid in the transfer. If you are unsure how to assess the transaction value, please consult the relevant section of the Fee Order Link opens in a new window (external website).

-
-
- AND/OR -
-

Enter the rent payable

-

Sorry only blank or numerical values are accepted.

- - -

Rent payable is the largest amount of annual rent the lease reserves within the first five years of its term, quantified at the time of application.

-
-
-
- Is this a Voluntary Application? - - - - -
-
- - -
-
-
- - - - - - - - - - - - - - - - - - - - -
Application type

Applicable fee scale

Stated value -

-

This value is based on the transaction value and/or the rent payable.

-

You entered either £0 or an invalid transaction value so £0 has been assumed. To enter a new value click ‘Start again’ below.

-

You entered either £0 or an invalid rent payable so £0 has been assumed. To enter a new value click ‘Start again’ below.

-

You entered either £0 or an invalid transaction value and rent payable so £0 for both has been assumed. To enter a new value click ‘Start again’ below.

-
Standard Fee -

-

(This figure includes a voluntary application reduction.)

-
Electronic Fee -

-
-
-

Notes

-

-
-

Find out about how to pay Land Registry fees Link opens in a new window (external website).

-

Please note reduced fees for electronic applications only apply to Dealings of Whole.

-

This application can be submitted electronically, however please note reduced fees for electronic applications only apply to applications affecting the whole of a registered title.

-

This application can be submitted electronically.

-
- -
-
-
-
- - -
-
-
-
- - From 53f615cf3776e77efe5c6c41b6cc45b41989c507 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 9 Sep 2025 10:09:55 +0100 Subject: [PATCH 19/23] Specify version for qonsole_rails gem Due to changes in the http client, faraday, the Qonsole data is not being parsed correctly and preventing the qonsole editor to return the expected JSON format response. This hotfix locks the Qonsole gem to a working version. Further investigation will be conducted via ticket [85](https://github.com/epimorphics/qonsole-rails/issues/85) --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 81435d7..e64b808 100644 --- a/Gemfile +++ b/Gemfile @@ -43,7 +43,7 @@ end source 'https://rubygems.pkg.github.com/epimorphics' do gem 'json_rails_logger' gem 'lr_common_styles' - gem 'qonsole_rails' + gem 'qonsole_rails', '=2.1.0' end # TODO: While running the rails app locally for testing you can set gems to your local path From abc919f453df400e33e1b6448fe8612fe933cc6d Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 9 Sep 2025 10:13:13 +0100 Subject: [PATCH 20/23] Update CHANGELOG for version 2.2.2 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a40015..a895fe6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ including the SPARQL Qonsole ## Unreleased +## 2.2.2 - 2025-09 + +- Lock Qonsole-rails gem to v2.1.0 to resolve JSON response issue + [85](https://github.com/epimorphics/qonsole-rails/issues/85) + ## 2.2.1 - 2025-08 - Resolved incorrect link to PPD Detailed Documentation From af73e4873b4a3877ad5908ee275e7cbb59b22254 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 9 Sep 2025 10:18:56 +0100 Subject: [PATCH 21/23] chore: downgrade faraday and related gems - Switches to an older version of a key HTTP client and its adapters - Updates dependencies to maintain compatibility with previous major version - Adjusts related dependencies for request middleware and connections - Updates a dependent module to match new requirement constraints - Adds and removes associated supporting gems as needed --- Gemfile.lock | 51 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 21a600d..83c6e83 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,18 +103,33 @@ GEM erb (5.0.2) erubi (1.13.1) execjs (2.10.0) - faraday (2.13.2) - faraday-net_http (>= 2.0, < 3.5) - json - logger + faraday (1.10.4) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.1) faraday-encoding (0.0.6) faraday - faraday-follow_redirects (0.3.0) - faraday (>= 1, < 3) - faraday-net_http (3.4.1) - net-http (>= 0.5.0) - faraday-retry (2.3.2) - faraday (~> 2.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.1.1) + multipart-post (~> 2.0) + faraday-net_http (1.0.2) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.1) + faraday (~> 1.0) ffi (1.17.2-aarch64-linux-gnu) ffi (1.17.2-aarch64-linux-musl) ffi (1.17.2-arm-linux-gnu) @@ -197,8 +212,7 @@ GEM modernizr-rails (2.7.1) modulejs-rails (2.2.0.0) railties (>= 4.0) - net-http (0.6.0) - uri + multipart-post (2.4.1) net-imap (0.5.9) date net-protocol @@ -328,6 +342,7 @@ GEM prism (>= 1.2, < 2.0) rbs (>= 3, < 5) ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -426,11 +441,10 @@ GEM modulejs-rails (~> 2.2.0) rails (~> 8.0.0) sass-rails (~> 6.0) - qonsole_rails (2.1.2) - faraday (~> 2.13) + qonsole_rails (2.1.0) + faraday (~> 1.10) faraday-encoding (~> 0.0.6) - faraday-follow_redirects (~> 0.3.0) - faraday-retry (~> 2.0) + faraday_middleware (~> 1.2) font-awesome-rails (~> 4.7.0) haml-rails (~> 2.1) jquery-datatables-rails (~> 3.4) @@ -438,6 +452,9 @@ GEM lodash-rails (~> 4.17) modulejs-rails (~> 2.2.0) rails (~> 8.0) + rubocop (~> 1.78) + rubocop-ast (~> 1.46) + rubocop-rails (~> 2.16) PLATFORMS aarch64-linux-gnu @@ -462,7 +479,7 @@ DEPENDENCIES prometheus-client puma puma-metrics - qonsole_rails! + qonsole_rails (= 2.1.0)! rails rubocop rubocop-rails From 8caf3bcc7a4a0ac1953c1b991431105c8474f239 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 9 Sep 2025 10:27:32 +0100 Subject: [PATCH 22/23] chore: bump patch version to 2.2.2 - Updates patch number to reflect latest fixes - Prepares for release with recent adjustments --- app/lib/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/version.rb b/app/lib/version.rb index 6a53310..033a607 100644 --- a/app/lib/version.rb +++ b/app/lib/version.rb @@ -3,7 +3,7 @@ module Version MAJOR = 2 MINOR = 2 - PATCH = 1 + PATCH = 2 SUFFIX = nil VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}#{SUFFIX && ".#{SUFFIX}"}".freeze end From 63895bbde220fcf41592d21c6989dea6e9d896a8 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 9 Sep 2025 11:02:06 +0100 Subject: [PATCH 23/23] Revert "Hotfix: Release v2.2.2" --- CHANGELOG.md | 5 ----- Gemfile | 2 +- Gemfile.lock | 51 ++++++++++++++++------------------------------ app/lib/version.rb | 2 +- 4 files changed, 19 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a895fe6..9a40015 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,6 @@ including the SPARQL Qonsole ## Unreleased -## 2.2.2 - 2025-09 - -- Lock Qonsole-rails gem to v2.1.0 to resolve JSON response issue - [85](https://github.com/epimorphics/qonsole-rails/issues/85) - ## 2.2.1 - 2025-08 - Resolved incorrect link to PPD Detailed Documentation diff --git a/Gemfile b/Gemfile index e64b808..81435d7 100644 --- a/Gemfile +++ b/Gemfile @@ -43,7 +43,7 @@ end source 'https://rubygems.pkg.github.com/epimorphics' do gem 'json_rails_logger' gem 'lr_common_styles' - gem 'qonsole_rails', '=2.1.0' + gem 'qonsole_rails' end # TODO: While running the rails app locally for testing you can set gems to your local path diff --git a/Gemfile.lock b/Gemfile.lock index 83c6e83..21a600d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,33 +103,18 @@ GEM erb (5.0.2) erubi (1.13.1) execjs (2.10.0) - faraday (1.10.4) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.1) + faraday (2.13.2) + faraday-net_http (>= 2.0, < 3.5) + json + logger faraday-encoding (0.0.6) faraday - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.1.1) - multipart-post (~> 2.0) - faraday-net_http (1.0.2) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - faraday_middleware (1.2.1) - faraday (~> 1.0) + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) + faraday-net_http (3.4.1) + net-http (>= 0.5.0) + faraday-retry (2.3.2) + faraday (~> 2.0) ffi (1.17.2-aarch64-linux-gnu) ffi (1.17.2-aarch64-linux-musl) ffi (1.17.2-arm-linux-gnu) @@ -212,7 +197,8 @@ GEM modernizr-rails (2.7.1) modulejs-rails (2.2.0.0) railties (>= 4.0) - multipart-post (2.4.1) + net-http (0.6.0) + uri net-imap (0.5.9) date net-protocol @@ -342,7 +328,6 @@ GEM prism (>= 1.2, < 2.0) rbs (>= 3, < 5) ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -441,10 +426,11 @@ GEM modulejs-rails (~> 2.2.0) rails (~> 8.0.0) sass-rails (~> 6.0) - qonsole_rails (2.1.0) - faraday (~> 1.10) + qonsole_rails (2.1.2) + faraday (~> 2.13) faraday-encoding (~> 0.0.6) - faraday_middleware (~> 1.2) + faraday-follow_redirects (~> 0.3.0) + faraday-retry (~> 2.0) font-awesome-rails (~> 4.7.0) haml-rails (~> 2.1) jquery-datatables-rails (~> 3.4) @@ -452,9 +438,6 @@ GEM lodash-rails (~> 4.17) modulejs-rails (~> 2.2.0) rails (~> 8.0) - rubocop (~> 1.78) - rubocop-ast (~> 1.46) - rubocop-rails (~> 2.16) PLATFORMS aarch64-linux-gnu @@ -479,7 +462,7 @@ DEPENDENCIES prometheus-client puma puma-metrics - qonsole_rails (= 2.1.0)! + qonsole_rails! rails rubocop rubocop-rails diff --git a/app/lib/version.rb b/app/lib/version.rb index 033a607..6a53310 100644 --- a/app/lib/version.rb +++ b/app/lib/version.rb @@ -3,7 +3,7 @@ module Version MAJOR = 2 MINOR = 2 - PATCH = 2 + PATCH = 1 SUFFIX = nil VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}#{SUFFIX && ".#{SUFFIX}"}".freeze end