Merge pull request #447 from epimorphics/task/release-candidate-1.7.5

Task: Release Candidate v 1.7.5

.gitignore

@@ -40,9 +40,10 @@ yarn-debug.log*
 /public/uploads
 
 ### Rails specific ###
+.byebug_history
 /public/system
 /coverage/
-/spec/tmp
+tmp
 
 # Ignore files specific to the development environment
 fc.json

.rubocop.yml

@@ -16,113 +16,145 @@ Layout/LineLength:
     - config/**/*
     - test/**/*
 
-Metrics/ClassLength:
-  Exclude:
-    - test/**/*
-
-Metrics/BlockLength:
-  Max: 30
-  Exclude:
-    - test/**/*
-    - lib/tasks/**/*
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
 
-Metrics/MethodLength:
-  Exclude:
-    - lib/tasks/location.rake
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
 
-Style/FormatStringToken:
-  Enabled: false
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
 
-Rails/OutputSafety:
-  Exclude:
-    - app/presenters/*.rb
+Lint/DuplicateElsifCondition:
+  Enabled: true
 
-Style/HashEachMethods:
+Lint/MixedRegexpCaptureTypes:
   Enabled: true
 
-Style/HashTransformKeys:
+Lint/RaiseException:
   Enabled: true
 
-Style/HashTransformValues:
+Lint/StructNewOverride:
   Enabled: true
 
 Metrics/AbcSize:
   Exclude:
     - lib/tasks/location.rake
 
+Metrics/BlockLength:
+  Max: 30
+  Exclude:
+    - test/**/*
+    - lib/tasks/**/*
+
+Metrics/ClassLength:
+  CountAsOne: ['array', 'hash', 'heredoc', 'method_call']
+  Exclude:
+    - test/**/*
+
 Metrics/CyclomaticComplexity:
   Exclude:
     - lib/tasks/location.rake
 
-Layout/SpaceAroundMethodCallOperator:
+Metrics/MethodLength:
+  CountAsOne: ['array', 'hash', 'heredoc', 'method_call']
+  Exclude:
+    - lib/tasks/location.rake
+
+Rails/ActiveRecordCallbacksOrder:
   Enabled: true
-Layout/EmptyLinesAroundAttributeAccessor:
+
+Rails/FindById:
   Enabled: true
-Lint/DeprecatedOpenSSLConstant:
+
+Rails/I18nLocaleAssignment:
   Enabled: true
-Lint/MixedRegexpCaptureTypes:
+  Exclude:
+    - test/**/*
+Rails/Inquiry:
   Enabled: true
-Lint/RaiseException:
+
+Rails/MailerName:
   Enabled: true
-Lint/StructNewOverride:
+
+Rails/MatchRoute:
   Enabled: true
-Style/ExponentialNotation:
+
+Rails/NegateInclude:
   Enabled: true
-Style/RedundantFetchBlock:
+
+Rails/Pluck:
   Enabled: true
-Style/RedundantRegexpCharacterClass:
+
+Rails/PluckInWhere:
   Enabled: true
-Style/RedundantRegexpEscape:
+
+Rails/RenderInline:
   Enabled: true
-Style/SlicingWithRange:
+
+Rails/RenderPlainText:
   Enabled: true
-Lint/DuplicateElsifCondition:
+
+Rails/ShortI18n:
   Enabled: true
+
+Rails/WhereExists:
+  Enabled: true
+
+Rails/OutputSafety:
+  Exclude:
+    - app/presenters/*.rb
+
 Style/AccessorGrouping:
   Enabled: true
+
 Style/ArrayCoercion:
   Enabled: true
+
 Style/BisectedAttrAccessor:
   Enabled: true
+
 Style/CaseLikeIf:
   Enabled: true
-Style/HashAsLastArrayItem:
-  Enabled: true
-Style/HashLikeCase:
-  Enabled: true
-Style/RedundantAssignment:
-  Enabled: true
-Style/RedundantFileExtensionInRequire:
-  Enabled: true
-Rails/ActiveRecordCallbacksOrder:
-  Enabled: true
-Rails/FindById:
+
+Style/ExponentialNotation:
   Enabled: true
-Rails/Inquiry:
+
+Style/FormatStringToken:
+  Enabled: false
+
+Style/HashAsLastArrayItem:
   Enabled: true
-Rails/MailerName:
+
+Style/HashEachMethods:
   Enabled: true
-Rails/MatchRoute:
+
+Style/HashLikeCase:
   Enabled: true
-Rails/NegateInclude:
+
+Style/HashTransformKeys:
   Enabled: true
-Rails/Pluck:
+
+Style/HashTransformValues:
   Enabled: true
-Rails/PluckInWhere:
+
+Style/RedundantAssignment:
   Enabled: true
-Rails/RenderInline:
+
+Style/RedundantFetchBlock:
   Enabled: true
-Rails/RenderPlainText:
+
+Style/RedundantFileExtensionInRequire:
   Enabled: true
-Rails/ShortI18n:
+
+Style/RedundantRegexpCharacterClass:
   Enabled: true
-Rails/WhereExists:
+
+Style/RedundantRegexpEscape:
   Enabled: true
 
-Rails/I18nLocaleAssignment:
+Style/SlicingWithRange:
   Enabled: true
-  Exclude:
-    - test/**/*
 
 Style/OpenStructUse:
   Enabled: false

CHANGELOG.md

@@ -1,6 +1,87 @@
 # Changes to the UKHPI app by version and date
 
-## unreleased
+## 1.7.5 - 2024-09
+
+- (Jon) Moved all mirrored configuration settings from individual environments
+  into the application configuration to reduce the need to manage multiple
+  sources of truth
+- (Jon) Actioned all of the outstanding updates contained within the dependabot
+  #443 PR as well as all updates implemented via yarn upgrade-interactive thus
+  bringing the application to the highest level of update available at this time
+  [GHD-443](https://github.com/epimorphics/ukhpi/pull/443)
+- (Jon) Swapped the `action_dispatch` subscriber for `action_controller` to
+  allow the `memory_used_mb` and `process_threads` metrics to report correctly
+  (Dan) Updates the property table ui so the label is clickable
+- (Dan) Replaces the buttons for checkboxes on the property tables
+  [GH-431](https://github.com/epimorphics/ukhpi/issues/431)
+- (Jon) Exposed `instrument_internal_error(exception)` metric to the
+  `ExceptionsController` to provide a count of internal errors
+  [GH-142](https://github.com/epimorphics/hmlr-linked-data/issues/142)
+- (Jon) Added puma.stats to footer template in development environment only,
+  again as per the approach in the [`LR_Common_Styles`
+  gem](https://github.com/epimorphics/lr_common_styles/releases/tag/1.9.6)
+- (Jon) Adjusted footer `link_to` helpers to only appending the lang parameter
+  to the url only if it exists for "internal" links as per the approach in the
+  [`LR_Common_Styles`
+  gem](https://github.com/epimorphics/lr_common_styles/releases/tag/1.9.6)
+- (Jon) Adjusted fix for visual contrast in the location selection menu via
+  additional styling and updated 3rd-party element use specific to ticket
+  [GH-408](https://github.com/epimorphics/ukhpi/issues/408) alongside adding
+  missing aria-attributes required for assisted use
+- (Jon) Implements revised approach to page titles mirrored on other suite apps,
+  as well as fixes white space typo in some concatenated page titles
+- (Jon) Added `process_threads` guage to prometheus metrics alongside isolating
+  thread counts to specific status' as per the Rails thread documentation as
+  well as updating the approach to resolve
+  [GH-142](https://github.com/epimorphics/hmlr-linked-data/issues/142)
+- (Jon) Excluded prometheus metrics from the testing environment to reduce noise
+  in the logs
+- (Jon) Added `puma-metrics` gem to provide base metrics for the Puma web server
+- (Jon) Updated .rubocop.yml primarily reorganising the rules alphabetically as
+  well as adding `CountAsOne` to both `Metrics/ClassLength` and
+  `Metrics/MethodLength`; includes files with removed earlier disabling of said
+  rules!
+- (Jon) Updated `.gitignore` to include ignoring byebug history as well as sets
+  the tmp directory ignore to be anywhere, not just at the project root
+- (Bogdan) Fixed a bug where CSS was being applied to the wrong element
+  [GH-412](https://github.com/epimorphics/ukhpi/issues/412)
+- (Bogdan) Fixed type in aria-label text
+  [GH-416](https://github.com/epimorphics/ukhpi/issues/416)
+- (Dan) Adds message for screenreaders for guidance on how to use tables
+  [Gh-405](https://github.com/epimorphics/ukhpi/issues/405)
+- (Dan) Fixed aria-label in compare locations form
+  [GH-416](https://github.com/epimorphics/ukhpi/issues/416)
+- (Dan) Adds `aria-label` link attributes on the about page to SPARQL link
+  [GH-413](https://github.com/epimorphics/ukhpi/issues/413)
+- (Bogdan) Fixed a bug where CSS was being applied to the wrong element
+  [GH-412](https://github.com/epimorphics/ukhpi/issues/412)
+- (Bogdan) Fixed type in aria-label text
+  [GH-416](https://github.com/epimorphics/ukhpi/issues/416)
+- (Bogdan) Fixed a duplicate character bug when selecting dates
+- (Bogdan) Added page titles for each individual view
+  [GH-409](https://github.com/epimorphics/ukhpi/issues/409)
+- (Bogdan) Set correct values for `aria-label` link attributes on the about page
+  [GH-413](https://github.com/epimorphics/ukhpi/issues/413)
+- (Bogdan) Increased contrast for compare location dropdowns
+  [GH-412](https://github.com/epimorphics/ukhpi/issues/412)
+- (Bogdan) Increased contrast for search location results, as well as when they
+  are being focused [GH-412](https://github.com/epimorphics/ukhpi/issues/412)
+- (Bogdan) CSS Refactoring
+- (Bogdan) Fixed a bug where CSS was applied to the wrong element, causing
+  search location results to be displayed incorrectly
+- (Bogdan) Increased focusable area for close button on modal and hide graph
+  button [GH-411](https://github.com/epimorphics/ukhpi/issues/411)
+- (Bogdan) Increased contrast for search location input and map elements, as
+  well as all modal buttons
+  [GH-408](https://github.com/epimorphics/ukhpi/issues/408)
+- (Bogdan) Increased contrast of modal warning message
+  [GH-407](https://github.com/epimorphics/ukhpi/issues/407)
+- (Bogdan) Increased contrast for modal close button and body
+  [GH-407](https://github.com/epimorphics/ukhpi/issues/407)
+- (Bogdan) Landing page links should now be more visible
+  [GH-406](https://github.com/epimorphics/ukhpi/issues/406)
+- (Bogdan) Added alt text to application logo
+  [GH-404](https://github.com/epimorphics/ukhpi/issues/404)
 
 ## 1.7.4 - 2024-05-01
 

Gemfile

@@ -32,6 +32,7 @@ gem 'get_process_mem', '~> 0.2.7'
 gem 'http_accept_language'
 gem 'prometheus-client', '~> 4.0'
 gem 'puma'
+gem 'puma-metrics'
 gem 'rdf-turtle'
 gem 'rubocop-rails'
 gem 'sentry-rails', '~> 5.7'
@@ -63,7 +64,7 @@ group :test do
   # gem 'minitest-spec-rails'
   gem 'mocha'
   gem 'selenium-webdriver'
-  gem 'simplecov', '0.22.0'
+  gem 'simplecov', '0.22.0', require: false
   gem 'vcr'
 end
 

Gemfile.lock

@@ -183,7 +183,6 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.4)
     minitest (5.18.1)
     minitest-rails (6.1.0)
       minitest (~> 5.10)
@@ -196,8 +195,9 @@ GEM
     mocha (1.13.0)
     multipart-post (2.3.0)
     nio4r (2.5.9)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.13.10-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.13.10-x86_64-linux)
       racc (~> 1.4)
     oj (3.14.2)
     parallel (1.22.1)
@@ -207,6 +207,9 @@ GEM
     public_suffix (5.0.3)
     puma (6.3.1)
       nio4r (~> 2.0)
+    puma-metrics (1.2.5)
+      prometheus-client (>= 0.10)
+      puma (>= 5.0)
     racc (1.7.1)
     rack (2.2.7)
     rack-proxy (0.7.6)
@@ -361,7 +364,8 @@ GEM
       railties
 
 PLATFORMS
-  ruby
+  x86_64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
   byebug
@@ -388,6 +392,7 @@ DEPENDENCIES
   oj (= 3.14.2)
   prometheus-client (~> 4.0)
   puma
+  puma-metrics
   rails (~> 6.0)
   rdf-turtle
   rubocop

Makefile

@@ -94,7 +94,7 @@ tag:
 
 test: assets
 	@echo "Running unit tests ..."
-	@./bin/bundle exec rake test
+	@./bin/rails test
 
 vars:
 	@echo "Docker: ${REPO}:${TAG}"