From d99bc9bb79ce2ee83cddecf8fef9027e0d1db69b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 15:27:24 +0000 Subject: [PATCH 001/104] build(deps): bump tar from 6.1.11 to 6.2.1 Bumps [tar](https://github.com/isaacs/node-tar) from 6.1.11 to 6.2.1. - [Release notes](https://github.com/isaacs/node-tar/releases) - [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md) - [Commits](https://github.com/isaacs/node-tar/compare/v6.1.11...v6.2.1) --- updated-dependencies: - dependency-name: tar dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index c377598e..c1de2674 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5160,6 +5160,11 @@ minipass@^3.0.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== + minizlib@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" @@ -7705,13 +7710,13 @@ tapable@^1.0.0, tapable@^1.1.3: integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== tar@^6.0.2: - version "6.1.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" - integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== + version "6.2.1" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" + integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" - minipass "^3.0.0" + minipass "^5.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" @@ -8481,4 +8486,4 @@ yargs@^13.3.2: yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== \ No newline at end of file + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== From d55d5a3562869502c7ce1f9d8e7fccdff1d00f7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 15:27:37 +0000 Subject: [PATCH 002/104] build(deps): bump follow-redirects from 1.14.9 to 1.15.6 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.9 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.9...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index c377598e..158ca2da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3632,9 +3632,9 @@ focus-trap@^6.0.1: tabbable "^5.2.1" follow-redirects@^1.0.0, follow-redirects@^1.14.8: - version "1.14.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" - integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== + version "1.15.6" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" + integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== for-each@^0.3.3: version "0.3.3" @@ -8481,4 +8481,4 @@ yargs@^13.3.2: yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== \ No newline at end of file + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== From 5807cfa6b4aa07676107f81364b1c697f3a4d4d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 15:28:00 +0000 Subject: [PATCH 003/104] build(deps): bump express from 4.17.3 to 4.19.2 Bumps [express](https://github.com/expressjs/express) from 4.17.3 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.17.3...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 162 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 91 insertions(+), 71 deletions(-) diff --git a/yarn.lock b/yarn.lock index c377598e..5564b80a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1698,21 +1698,23 @@ bn.js@^5.0.0, bn.js@^5.1.1: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== -body-parser@1.19.2: - version "1.19.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e" - integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw== +body-parser@1.20.2: + version "1.20.2" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" + integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== dependencies: bytes "3.1.2" - content-type "~1.0.4" + content-type "~1.0.5" debug "2.6.9" - depd "~1.1.2" - http-errors "1.8.1" + depd "2.0.0" + destroy "1.2.0" + http-errors "2.0.0" iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.9.7" - raw-body "2.4.3" + on-finished "2.4.1" + qs "6.11.0" + raw-body "2.5.2" type-is "~1.6.18" + unpipe "1.0.0" bonjour@^3.5.0: version "3.5.0" @@ -2262,6 +2264,11 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== +content-type@~1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" + integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== + convert-source-map@^1.7.0: version "1.8.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" @@ -2274,10 +2281,10 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== -cookie@0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" - integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== +cookie@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" + integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== copy-concurrently@^1.0.0: version "1.0.5" @@ -2793,6 +2800,11 @@ del@^4.1.1: pify "^4.0.1" rimraf "^2.6.3" +depd@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" @@ -2806,10 +2818,10 @@ des.js@^1.0.0: inherits "^2.0.1" minimalistic-assert "^1.0.0" -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - integrity sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg== +destroy@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" + integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== detect-file@^1.0.0: version "1.0.0" @@ -3375,37 +3387,38 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: homedir-polyfill "^1.0.1" express@^4.17.1: - version "4.17.3" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1" - integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg== + version "4.19.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465" + integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.19.2" + body-parser "1.20.2" content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.4.2" + cookie "0.6.0" cookie-signature "1.0.6" debug "2.6.9" - depd "~1.1.2" + depd "2.0.0" encodeurl "~1.0.2" escape-html "~1.0.3" etag "~1.8.1" - finalhandler "~1.1.2" + finalhandler "1.2.0" fresh "0.5.2" + http-errors "2.0.0" merge-descriptors "1.0.1" methods "~1.1.2" - on-finished "~2.3.0" + on-finished "2.4.1" parseurl "~1.3.3" path-to-regexp "0.1.7" proxy-addr "~2.0.7" - qs "6.9.7" + qs "6.11.0" range-parser "~1.2.1" safe-buffer "5.2.1" - send "0.17.2" - serve-static "1.14.2" + send "0.18.0" + serve-static "1.15.0" setprototypeof "1.2.0" - statuses "~1.5.0" + statuses "2.0.1" type-is "~1.6.18" utils-merge "1.0.1" vary "~1.1.2" @@ -3524,17 +3537,17 @@ filter-obj@^1.1.0: resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b" integrity sha1-mzERErxsYSehbgFsbF1/GeCAXFs= -finalhandler@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== +finalhandler@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" + integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== dependencies: debug "2.6.9" encodeurl "~1.0.2" escape-html "~1.0.3" - on-finished "~2.3.0" + on-finished "2.4.1" parseurl "~1.3.3" - statuses "~1.5.0" + statuses "2.0.1" unpipe "~1.0.0" find-cache-dir@^2.1.0: @@ -4082,15 +4095,15 @@ http-deceiver@^1.2.7: resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw== -http-errors@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" - integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== +http-errors@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" + integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== dependencies: - depd "~1.1.2" + depd "2.0.0" inherits "2.0.4" setprototypeof "1.2.0" - statuses ">= 1.5.0 < 2" + statuses "2.0.1" toidentifier "1.0.1" http-errors@~1.6.2: @@ -5499,10 +5512,10 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww== +on-finished@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" + integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== dependencies: ee-first "1.1.1" @@ -6663,10 +6676,12 @@ q@^1.1.2: resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= -qs@6.9.7: - version "6.9.7" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe" - integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw== +qs@6.11.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== + dependencies: + side-channel "^1.0.4" query-string@^4.1.0: version "4.3.4" @@ -6729,13 +6744,13 @@ range-parser@^1.2.1, range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c" - integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g== +raw-body@2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" + integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== dependencies: bytes "3.1.2" - http-errors "1.8.1" + http-errors "2.0.0" iconv-lite "0.4.24" unpipe "1.0.0" @@ -7148,24 +7163,24 @@ semver@^7.3.2, semver@^7.3.5: dependencies: lru-cache "^6.0.0" -send@0.17.2: - version "0.17.2" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" - integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww== +send@0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" + integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== dependencies: debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" + depd "2.0.0" + destroy "1.2.0" encodeurl "~1.0.2" escape-html "~1.0.3" etag "~1.8.1" fresh "0.5.2" - http-errors "1.8.1" + http-errors "2.0.0" mime "1.6.0" ms "2.1.3" - on-finished "~2.3.0" + on-finished "2.4.1" range-parser "~1.2.1" - statuses "~1.5.0" + statuses "2.0.1" serialize-javascript@^4.0.0: version "4.0.0" @@ -7194,15 +7209,15 @@ serve-index@^1.9.1: mime-types "~2.1.17" parseurl "~1.3.2" -serve-static@1.14.2: - version "1.14.2" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa" - integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ== +serve-static@1.15.0: + version "1.15.0" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" + integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== dependencies: encodeurl "~1.0.2" escape-html "~1.0.3" parseurl "~1.3.3" - send "0.17.2" + send "0.18.0" set-blocking@^2.0.0: version "2.0.0" @@ -7457,7 +7472,12 @@ static-extend@^0.1.1: define-property "^0.2.5" object-copy "^0.1.0" -"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: +statuses@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + +"statuses@>= 1.4.0 < 2": version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== @@ -8481,4 +8501,4 @@ yargs@^13.3.2: yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== \ No newline at end of file + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== From 9dc94a530003855e34c9154d734e93182dbab42e Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Thu, 8 Aug 2024 12:25:33 +0100 Subject: [PATCH 004/104] Added alt text for UKHPI logo --- app/views/common/_header.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/common/_header.html.haml b/app/views/common/_header.html.haml index 0ec881ec..a5256a23 100644 --- a/app/views/common/_header.html.haml +++ b/app/views/common/_header.html.haml @@ -3,7 +3,7 @@ .header-global .header-logo %a.content{ href: "#{Rails.application.config.relative_url_root}", title: t('common.header.home_link') } - = image_tag('ukhpi-icon.png', srcset: image_path('ukhpi-icon.svg'), alt: '') + = image_tag('ukhpi-icon.png', srcset: image_path('ukhpi-icon.svg'), alt: 'UKHPI Logo') .header-proposition From 898e5c22771b7b7d702d0b1cab9571da79fddc46 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Thu, 8 Aug 2024 12:25:45 +0100 Subject: [PATCH 005/104] Added alt text for app logo when printing --- app/views/layouts/print.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/print.html.haml b/app/views/layouts/print.html.haml index 1a121d88..5b6b05e1 100644 --- a/app/views/layouts/print.html.haml +++ b/app/views/layouts/print.html.haml @@ -28,7 +28,7 @@ .header-global .header-logo %a.content{ href: "#{Rails.application.config.relative_url_root}", title: t('common.header.home_link') } - = image_tag('ukhpi-icon.png', srcset: image_path('ukhpi-icon.svg'), alt: '') + = image_tag('ukhpi-icon.png', srcset: image_path('ukhpi-icon.svg'), alt: 'UKHPI Logo') .header-proposition .content %nav#proposition-menu From f03a8be75ecba3f56d40e4e52a53c54c39ab14e1 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Thu, 8 Aug 2024 12:25:52 +0100 Subject: [PATCH 006/104] Bumped app version --- 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 5473a788..011f92f0 100644 --- a/app/lib/version.rb +++ b/app/lib/version.rb @@ -3,7 +3,7 @@ module Version MAJOR = 1 MINOR = 7 - PATCH = 4 + PATCH = 5 SUFFIX = nil VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}#{SUFFIX && ".#{SUFFIX}"}" end From 479f1cd15ae3bcb63280387e6f8d9280838fa403 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Thu, 8 Aug 2024 12:26:00 +0100 Subject: [PATCH 007/104] Added changelog entry --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbbbd85a..6950b372 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changes to the UKHPI app by version and date -## unreleased +## 1.7.5 - 2024-08 + +- (Bogdan) Added alt text to application logo [GH-404](https://github.com/epimorphics/ukhpi/issues/404) ## 1.7.4 - 2024-04-19 From 11ccc3b06af326ec1a1f7c6131898a4fff70f009 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 9 Aug 2024 12:39:15 +0100 Subject: [PATCH 008/104] Added underline text decoration for links --- app/assets/stylesheets/landing.scss.erb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/assets/stylesheets/landing.scss.erb b/app/assets/stylesheets/landing.scss.erb index 896e3e9c..fe971c14 100644 --- a/app/assets/stylesheets/landing.scss.erb +++ b/app/assets/stylesheets/landing.scss.erb @@ -4,11 +4,7 @@ .c-landing-page { a { - text-decoration: none; - - &:hover { - text-decoration: underline; - } + text-decoration: underline; } .c-logos { From 7c6394bb84114215cf8024a83596cd25b05c562a Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 9 Aug 2024 12:39:22 +0100 Subject: [PATCH 009/104] Changelog entry added --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6950b372..524acaae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 1.7.5 - 2024-08 +- (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-04-19 From 74aa2ff3d73641adb51845304ef7044e9ec0515b Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Mon, 12 Aug 2024 16:10:32 +0100 Subject: [PATCH 010/104] Set font color for modal body text --- app/assets/stylesheets/_ukhpi-location-select.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/_ukhpi-location-select.scss b/app/assets/stylesheets/_ukhpi-location-select.scss index aed0f436..1647609b 100644 --- a/app/assets/stylesheets/_ukhpi-location-select.scss +++ b/app/assets/stylesheets/_ukhpi-location-select.scss @@ -3,5 +3,6 @@ .el-dialog__body { padding: 5px 20px; + color: #000000; } } From f751a9f7655837b38f1fa52f15691eaab8939b35 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Mon, 12 Aug 2024 16:10:46 +0100 Subject: [PATCH 011/104] Set color of modal close button --- app/assets/stylesheets/_ukhpi-location-select.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/_ukhpi-location-select.scss b/app/assets/stylesheets/_ukhpi-location-select.scss index 1647609b..e083d315 100644 --- a/app/assets/stylesheets/_ukhpi-location-select.scss +++ b/app/assets/stylesheets/_ukhpi-location-select.scss @@ -5,4 +5,8 @@ padding: 5px 20px; color: #000000; } + + .el-dialog__close { + color: #000000; + } } From 7a24e498a890d7949a82a73918712cec3d3e4549 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Mon, 12 Aug 2024 16:10:52 +0100 Subject: [PATCH 012/104] Added changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 524acaae..59d70316 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 1.7.5 - 2024-08 +- (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) From 2ae2ac6a62e3f531451cbf6884ceb05db41671f3 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Tue, 13 Aug 2024 14:20:32 +0100 Subject: [PATCH 013/104] Increased contrast of warning message --- app/assets/stylesheets/_ukhpi-location-select.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/_ukhpi-location-select.scss b/app/assets/stylesheets/_ukhpi-location-select.scss index e083d315..1119c472 100644 --- a/app/assets/stylesheets/_ukhpi-location-select.scss +++ b/app/assets/stylesheets/_ukhpi-location-select.scss @@ -9,4 +9,8 @@ .el-dialog__close { color: #000000; } + + .el-alert--warning.is-light { + color: #a4742b; + } } From ee958691351f118ba2766e7092ed658591f35310 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Tue, 13 Aug 2024 14:21:05 +0100 Subject: [PATCH 014/104] Added changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59d70316..1e9262e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 1.7.5 - 2024-08 +- (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) From 749e0f8d5b4a2c71ffd0706f1a6ee65a131d350e Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Tue, 13 Aug 2024 15:33:57 +0100 Subject: [PATCH 015/104] Make search location input border darker --- app/assets/stylesheets/_ukhpi-location-select.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/_ukhpi-location-select.scss b/app/assets/stylesheets/_ukhpi-location-select.scss index 1119c472..98a41740 100644 --- a/app/assets/stylesheets/_ukhpi-location-select.scss +++ b/app/assets/stylesheets/_ukhpi-location-select.scss @@ -10,6 +10,10 @@ color: #000000; } + .el-input__inner { + border: 1px solid #9ea0a5; + } + .el-alert--warning.is-light { color: #a4742b; } From 51abc755078140f3d58a13083d25a7e1d1edcad9 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Tue, 13 Aug 2024 15:34:12 +0100 Subject: [PATCH 016/104] Set font color for buttons to black --- app/assets/stylesheets/_ukhpi-location-select.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/_ukhpi-location-select.scss b/app/assets/stylesheets/_ukhpi-location-select.scss index 98a41740..301c9c5d 100644 --- a/app/assets/stylesheets/_ukhpi-location-select.scss +++ b/app/assets/stylesheets/_ukhpi-location-select.scss @@ -17,4 +17,8 @@ .el-alert--warning.is-light { color: #a4742b; } + + .el-button { + color: #000000; + } } From 2e0ceee4e715869110993d90c027ba16c596812b Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Tue, 13 Aug 2024 15:34:36 +0100 Subject: [PATCH 017/104] Set text color for inner radio buttons to black --- app/assets/stylesheets/_ukhpi-maps.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/_ukhpi-maps.scss b/app/assets/stylesheets/_ukhpi-maps.scss index 3b58ee39..450d5f26 100644 --- a/app/assets/stylesheets/_ukhpi-maps.scss +++ b/app/assets/stylesheets/_ukhpi-maps.scss @@ -22,6 +22,7 @@ width: 100%; border: 0; border-radius: 0; + color: #000000; } } From d3c4f56abe39d7c084c68c42aaa29a87209ebfc1 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Tue, 13 Aug 2024 15:34:52 +0100 Subject: [PATCH 018/104] Increase contrast for selected radio button --- app/assets/stylesheets/_ukhpi-maps.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/_ukhpi-maps.scss b/app/assets/stylesheets/_ukhpi-maps.scss index 450d5f26..460c5102 100644 --- a/app/assets/stylesheets/_ukhpi-maps.scss +++ b/app/assets/stylesheets/_ukhpi-maps.scss @@ -24,6 +24,10 @@ border-radius: 0; color: #000000; } + + .el-radio-button__orig-radio:checked+.el-radio-button__inner { + background-color: #2c659f; + } } .leaflet-container { From 2b8a70dddfd8cb3fc8f75ec9dae470dfa53c699a Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Tue, 13 Aug 2024 15:35:04 +0100 Subject: [PATCH 019/104] Added changelog entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e9262e1..0d79f535 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 1.7.5 - 2024-08 +- (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) From 590330b175358b072c1f08829bdb879dfb8214e7 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 11:09:59 +0100 Subject: [PATCH 020/104] Increased focusable area for hide/show graphs button --- app/assets/stylesheets/_data-view.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/_data-view.scss b/app/assets/stylesheets/_data-view.scss index 6dbdc029..533d5197 100644 --- a/app/assets/stylesheets/_data-view.scss +++ b/app/assets/stylesheets/_data-view.scss @@ -53,6 +53,7 @@ $options-panel-grey: #eef1f6; } .js .o-data-view__hide-action { + padding: 1px 5px; font-size: 0; text-decoration: none; } From 42ed58ce7f76a201f1b81d282c8b6fdffcdc18fc Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 11:10:25 +0100 Subject: [PATCH 021/104] Fixed a CSS issue with the search location results --- app/assets/stylesheets/_ukhpi-location-select.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/_ukhpi-location-select.scss b/app/assets/stylesheets/_ukhpi-location-select.scss index 301c9c5d..932ceacd 100644 --- a/app/assets/stylesheets/_ukhpi-location-select.scss +++ b/app/assets/stylesheets/_ukhpi-location-select.scss @@ -18,7 +18,7 @@ color: #a4742b; } - .el-button { + .el-dialog__footer .el-button { color: #000000; } } From 51a07f5e4b5938fdb72c0129f13794b5071e2ee9 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 11:10:36 +0100 Subject: [PATCH 022/104] Increased focusable area for modal close button --- app/assets/stylesheets/_ukhpi-location-select.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/_ukhpi-location-select.scss b/app/assets/stylesheets/_ukhpi-location-select.scss index 932ceacd..f766a3ae 100644 --- a/app/assets/stylesheets/_ukhpi-location-select.scss +++ b/app/assets/stylesheets/_ukhpi-location-select.scss @@ -8,6 +8,7 @@ .el-dialog__close { color: #000000; + padding: 4px; } .el-input__inner { From 6aef5ff51cad863f02d34b9d96ab13a5ab906a2d Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 11:10:53 +0100 Subject: [PATCH 023/104] Added changelog entries --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d79f535..8d7d0c35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## 1.7.5 - 2024-08 +- (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) From dd00fdcc7fc46e7ecd2d0a50a9aff732f784eeb8 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 11:14:10 +0100 Subject: [PATCH 024/104] Refactored CSS rules --- app/assets/stylesheets/_ukhpi-location-select.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/_ukhpi-location-select.scss b/app/assets/stylesheets/_ukhpi-location-select.scss index f766a3ae..ae23fa79 100644 --- a/app/assets/stylesheets/_ukhpi-location-select.scss +++ b/app/assets/stylesheets/_ukhpi-location-select.scss @@ -19,7 +19,9 @@ color: #a4742b; } - .el-dialog__footer .el-button { - color: #000000; + .el-dialog__footer { + .el-button { + color: #000000; + } } } From 75bd39e9e2bb45b848205a6a96b968521c773eaa Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 16:40:41 +0100 Subject: [PATCH 025/104] More CSS refactoring --- app/assets/stylesheets/_ukhpi-maps.scss | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/_ukhpi-maps.scss b/app/assets/stylesheets/_ukhpi-maps.scss index 460c5102..9fe145c6 100644 --- a/app/assets/stylesheets/_ukhpi-maps.scss +++ b/app/assets/stylesheets/_ukhpi-maps.scss @@ -18,15 +18,17 @@ display: flex; flex-direction: column; - .el-radio-button__inner { - width: 100%; - border: 0; - border-radius: 0; - color: #000000; - } - - .el-radio-button__orig-radio:checked+.el-radio-button__inner { - background-color: #2c659f; + .el-radio-button { + &__inner { + width: 100%; + border: 0; + border-radius: 0; + color: #000000; + } + + &.is-active { + background-color: #409eff; + } } } From d6e02716334689a932ecb100e2aeb6ab34fa34e6 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 16:41:20 +0100 Subject: [PATCH 026/104] Fixed a CSS issue with modal buttons --- .../stylesheets/_ukhpi-location-select.scss | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/_ukhpi-location-select.scss b/app/assets/stylesheets/_ukhpi-location-select.scss index ae23fa79..f0e05e85 100644 --- a/app/assets/stylesheets/_ukhpi-location-select.scss +++ b/app/assets/stylesheets/_ukhpi-location-select.scss @@ -1,14 +1,22 @@ .o-select-location { text-align: left; - .el-dialog__body { - padding: 5px 20px; - color: #000000; - } + .el-dialog { + &__body { + padding: 5px 20px; + color: #000000; + } + + &__close { + color: #000000; + padding: 4px; + } - .el-dialog__close { - color: #000000; - padding: 4px; + &__footer { + .el-button--default { + color: #000000; + } + } } .el-input__inner { @@ -19,9 +27,6 @@ color: #a4742b; } - .el-dialog__footer { - .el-button { - color: #000000; } } } From d53f7c45d368fe6a91952cf514a87e7b52c14bc0 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 16:42:08 +0100 Subject: [PATCH 027/104] Increased contrast for location results names --- app/assets/stylesheets/_ukhpi-location-select.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/stylesheets/_ukhpi-location-select.scss b/app/assets/stylesheets/_ukhpi-location-select.scss index f0e05e85..cd96ebaa 100644 --- a/app/assets/stylesheets/_ukhpi-location-select.scss +++ b/app/assets/stylesheets/_ukhpi-location-select.scss @@ -27,6 +27,9 @@ color: #a4742b; } + .o-search-location__results { + .el-button--text { + color: #0050a2; } } } From faa596a6fb7d3ca542dc0df967c701915cf836a5 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 16:42:28 +0100 Subject: [PATCH 028/104] Increased contrast on location result hover and focus --- app/assets/stylesheets/_ukhpi-location-select.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/_ukhpi-location-select.scss b/app/assets/stylesheets/_ukhpi-location-select.scss index cd96ebaa..782ec04b 100644 --- a/app/assets/stylesheets/_ukhpi-location-select.scss +++ b/app/assets/stylesheets/_ukhpi-location-select.scss @@ -30,6 +30,10 @@ .o-search-location__results { .el-button--text { color: #0050a2; + + &:focus, &:hover { + color: #007dff; + } } } } From 906ea1c9e5b592f9f66c860709cf765affac5983 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 16:42:40 +0100 Subject: [PATCH 029/104] Added changelog entries --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d7d0c35..7b94461f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 1.7.5 - 2024-08 +- (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 From 0aecf0fde8ec41451893566e734454d94904773a Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 17:22:30 +0100 Subject: [PATCH 030/104] Increased contrast for compare location dropdowns --- app/assets/stylesheets/_element-rails.scss | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/_element-rails.scss b/app/assets/stylesheets/_element-rails.scss index 7b9e5db5..098c1767 100644 --- a/app/assets/stylesheets/_element-rails.scss +++ b/app/assets/stylesheets/_element-rails.scss @@ -51,7 +51,12 @@ table.el-month-table { } } -.el-select-dropdown__item.selected { - background-color: $dark-blue; - color: white; -} \ No newline at end of file +.el-select-dropdown__item { + &.selected { + background-color: $dark-blue; + color: white; + } + &.hover { + background-color: #e6e6e6; + } +} From a8c4264cb0b025eb8207793c7549acf5c242caa3 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 17:22:38 +0100 Subject: [PATCH 031/104] Added changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b94461f..12371667 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 1.7.5 - 2024-08 +- (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 From 6525d5afd87639af5058259d0337057fdda9339e Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Thu, 15 Aug 2024 10:37:15 +0100 Subject: [PATCH 032/104] Added on focus and on hover CSS styles for location search results --- app/assets/stylesheets/_ukhpi-location-select.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/_ukhpi-location-select.scss b/app/assets/stylesheets/_ukhpi-location-select.scss index 782ec04b..c96d9633 100644 --- a/app/assets/stylesheets/_ukhpi-location-select.scss +++ b/app/assets/stylesheets/_ukhpi-location-select.scss @@ -27,7 +27,11 @@ color: #a4742b; } - .o-search-location__results { + .o-search-location__result { + &:focus, &:hover { + background-color: #e6e6e6; + } + .el-button--text { color: #0050a2; From 425ead85cef57adf99799bb5656f7634c00100c2 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Thu, 15 Aug 2024 15:38:09 +0100 Subject: [PATCH 033/104] Changed aria-labels to include link text, english version --- app/views/doc/_about_ukhpi_en.html.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/doc/_about_ukhpi_en.html.haml b/app/views/doc/_about_ukhpi_en.html.haml index 73b25218..3827e33a 100644 --- a/app/views/doc/_about_ukhpi_en.html.haml +++ b/app/views/doc/_about_ukhpi_en.html.haml @@ -71,9 +71,9 @@ %ul.list.list-bullet %li interactively, using the - = link_to("/app/ukhpi", 'aria-label' => 'Explore the UK house price index') do + = link_to("/app/ukhpi", 'aria-label' => 'UK House Price Index tool') do = succeed "." do - Search the UK House Price Index tool + UK House Price Index tool This tool also includes options to download the data in CSV or Turtle and to generate downloadable files from SPARQL queries in JSON, XML, plain text or as a table. %li for download in @@ -135,8 +135,8 @@ %h2.heading-medium The UK House Price Index reporting tool %p The - = link_to("report tool", "/app/ukhpi", 'aria-label' => 'Explore the UK house price index') - is the easiest way to query the UKHouse Price Index dataset. It allows the easy creation of queries using a form and results can be downloaded in various forms. The report builder can also be used to generate SPARQL queries that can be amended and re-run as required. + = link_to("report tool", "/app/ukhpi", 'aria-label' => 'report tool') + is the easiest way to query the UK House Price Index dataset. It allows the easy creation of queries using a form and results can be downloaded in various forms. The report builder can also be used to generate SPARQL queries that can be amended and re-run as required. %p Please note that when choosing the CSV option for downloaded data then only the data items shown in the result on screen will be included in the CSV. For Turtle downloads all data items will be included as will the result from the SPARQL query if re-run. From bfc171d81ed7a5390595c1b2c95d39236b99adb7 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Thu, 15 Aug 2024 15:38:27 +0100 Subject: [PATCH 034/104] Changed aria-labels to include link text, welsh version --- app/views/doc/_about_ukhpi_cy.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/doc/_about_ukhpi_cy.html.haml b/app/views/doc/_about_ukhpi_cy.html.haml index f369766a..8dd3bf9e 100644 --- a/app/views/doc/_about_ukhpi_cy.html.haml +++ b/app/views/doc/_about_ukhpi_cy.html.haml @@ -76,7 +76,7 @@ %ul.list.list-bullet %li yn rhyngweithiol, gan ddefnyddio’r - = link_to('/app/ukhpi?lang=cy', 'aria-label' => 'Explore the UK house price index') do + = link_to('/app/ukhpi?lang=cy', 'aria-label' => 'teclyn Chwilio Mynegai Prisiau Tai y DU') do = succeed "." do teclyn Chwilio Mynegai Prisiau Tai y DU Mae’r teclyn hwn hefyd yn cynnwys opsiynau i lawrlwytho mewn CSV neu Turtle @@ -151,7 +151,7 @@ %h2.heading-medium Teclyn adrodd Mynegai Prisiau Tai y DU %p Y - = link_to('teclyn adrodd', '/app/ukhpi?lang=cy', 'aria-label' => 'Explore the UK house price index') + = link_to('teclyn adrodd', '/app/ukhpi?lang=cy', 'aria-label' => 'teclyn adrodd') yw’r ffordd hawsaf i ymholi set data Mynegai Prisiau Tai y DU. Mae’n cynnig dull hawdd o greu ymholiadau trwy ddefnyddio ffurflen a gall canlyniadau gael eu lawrlwytho ar ffurfiau amrywiol. Gellir defnyddio’r lluniwr adroddiadau From 69814051132155001f8654f331fad1205f28043e Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Thu, 15 Aug 2024 15:38:34 +0100 Subject: [PATCH 035/104] Added changelog entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12371667..72769f20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 1.7.5 - 2024-08 +- (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) From 93e88dc3580db63c803de5cbd435f6f8eb557132 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 16 Aug 2024 12:44:09 +0100 Subject: [PATCH 036/104] Added support for individual page titles --- app/views/layouts/webpack_application.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/webpack_application.html.haml b/app/views/layouts/webpack_application.html.haml index d0f64e91..3e5ef16c 100644 --- a/app/views/layouts/webpack_application.html.haml +++ b/app/views/layouts/webpack_application.html.haml @@ -5,7 +5,7 @@ %meta{ 'http-equiv' => 'x-ua-compatible', content: 'ie=edge' } %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no' } %title - = I18n.t('common.header.app_title') + = (yield(:title) + " - " unless yield(:title).blank?).to_s + I18n.t('common.header.app_title') :javascript document.querySelector('html').classList.add('js'); window.ukhpi = window.ukhpi || {}; From 6e3b3167983265fa3a857289b9f8dc6296689f3b Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 16 Aug 2024 12:44:29 +0100 Subject: [PATCH 037/104] Set heading based on title for english landing page --- app/views/landing/_index_en.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/landing/_index_en.html.haml b/app/views/landing/_index_en.html.haml index cc900970..6ba8dee7 100644 --- a/app/views/landing/_index_en.html.haml +++ b/app/views/landing/_index_en.html.haml @@ -1,5 +1,6 @@ %section#main.c-landing-page.u-lang--en - %h1.heading-large UK House Price Index + %h1.heading-large + = I18n.t('common.header.app_title') %p Use the search tool to find house price trends in the UK: From 543ee5cb61b5da3892a8c28d023914983d316b1b Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 16 Aug 2024 12:44:37 +0100 Subject: [PATCH 038/104] Set heading based on title for welsh landing page --- app/views/landing/_index_cy.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/landing/_index_cy.html.haml b/app/views/landing/_index_cy.html.haml index f0109656..e8023f23 100644 --- a/app/views/landing/_index_cy.html.haml +++ b/app/views/landing/_index_cy.html.haml @@ -1,5 +1,6 @@ %section#main.c-landing-page.u-lang--en - %h1.heading-large Mynegai Prisiau Tai y DU + %h1.heading-large + = I18n.t('common.header.app_title') %p Defnyddiwch y teclyn chwilio i weld tueddiadau prisiau tai yn y DU: From 5888afdf1bf33a9db8f8022722d33ed3d14ff957 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 16 Aug 2024 12:45:10 +0100 Subject: [PATCH 039/104] Further added support for individual page titles --- app/views/layouts/application.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 760463c0..36cc3821 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -5,7 +5,7 @@ %meta{ 'http-equiv' => 'x-ua-compatible', content: 'ie=edge' } %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no' } %title - = I18n.t('common.header.app_title') + = (yield(:title) + " - " unless yield(:title).blank?).to_s + I18n.t('common.header.app_title') - if Rails.env.production? = render partial: 'common/google-analytics' = javascript_include_tag 'cookie', defer: true From 2cafa61ff98a83e4bc3414c9b60c53140dd808fa Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 16 Aug 2024 12:45:32 +0100 Subject: [PATCH 040/104] Making sure individual page titles show up when printing --- app/views/layouts/print.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/print.html.haml b/app/views/layouts/print.html.haml index 5b6b05e1..bfbf4501 100644 --- a/app/views/layouts/print.html.haml +++ b/app/views/layouts/print.html.haml @@ -5,7 +5,7 @@ %meta{ 'http-equiv' => 'x-ua-compatible', content: 'ie=edge' } %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no' } %title - = I18n.t('common.header.app_title') + = (yield(:title) + " - " unless yield(:title).blank?).to_s + I18n.t('common.header.app_title') - if Rails.env.production? = render partial: 'common/google-analytics' = csrf_meta_tags From 59fddb00ef8476022cbf99268910ab151ba9b157 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 16 Aug 2024 12:46:27 +0100 Subject: [PATCH 041/104] Set title for the about page Both english and welsh versions --- app/views/doc/_about_ukhpi_cy.html.haml | 2 +- app/views/doc/_about_ukhpi_en.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/doc/_about_ukhpi_cy.html.haml b/app/views/doc/_about_ukhpi_cy.html.haml index 8dd3bf9e..4e8b3d23 100644 --- a/app/views/doc/_about_ukhpi_cy.html.haml +++ b/app/views/doc/_about_ukhpi_cy.html.haml @@ -1,4 +1,4 @@ -%h1.heading-large Data Cysylltiedig Mynegai Prisiau Tai y DU += content_for(:title, "Am") %h2.heading-medium Beth sydd wedi ei gynnwys yn Set Ddata’r Mynegai Prisiau Tai? diff --git a/app/views/doc/_about_ukhpi_en.html.haml b/app/views/doc/_about_ukhpi_en.html.haml index 3827e33a..540d5499 100644 --- a/app/views/doc/_about_ukhpi_en.html.haml +++ b/app/views/doc/_about_ukhpi_en.html.haml @@ -1,4 +1,4 @@ -%h1.heading-large UK House Price Index Linked Data += content_for(:title, "About") %h2.heading-medium What does the House Price Index Dataset consist of? From 9c97efc3c4eb6835f615088ab28df397e6741d5c Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 16 Aug 2024 12:46:42 +0100 Subject: [PATCH 042/104] Set custom heading based on title for about page Both english and welsh versions --- app/views/doc/_about_ukhpi_cy.html.haml | 3 +++ app/views/doc/_about_ukhpi_en.html.haml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/app/views/doc/_about_ukhpi_cy.html.haml b/app/views/doc/_about_ukhpi_cy.html.haml index 4e8b3d23..dc3602ad 100644 --- a/app/views/doc/_about_ukhpi_cy.html.haml +++ b/app/views/doc/_about_ukhpi_cy.html.haml @@ -1,5 +1,8 @@ = content_for(:title, "Am") +%h1.heading-large + = yield(:title) + " - " + I18n.t('common.header.app_title') + %h2.heading-medium Beth sydd wedi ei gynnwys yn Set Ddata’r Mynegai Prisiau Tai? diff --git a/app/views/doc/_about_ukhpi_en.html.haml b/app/views/doc/_about_ukhpi_en.html.haml index 540d5499..b46b0683 100644 --- a/app/views/doc/_about_ukhpi_en.html.haml +++ b/app/views/doc/_about_ukhpi_en.html.haml @@ -1,5 +1,8 @@ = content_for(:title, "About") +%h1.heading-large + = yield(:title) + " - " + I18n.t('common.header.app_title') + %h2.heading-medium What does the House Price Index Dataset consist of? From e4e5bc3467e2103eb6516923d4776e7b13cb2596 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 16 Aug 2024 12:47:00 +0100 Subject: [PATCH 043/104] Set title for browse page --- app/views/browse/show.html.haml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/browse/show.html.haml b/app/views/browse/show.html.haml index 0901a8d2..cc8a37e9 100644 --- a/app/views/browse/show.html.haml +++ b/app/views/browse/show.html.haml @@ -1,3 +1,5 @@ += content_for(:title, "Browse") + .grid-row .column-full %article From a6521b45ddb72b8657d21f042336a3128171b5b0 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 16 Aug 2024 12:47:10 +0100 Subject: [PATCH 044/104] Set title for compare locations page --- app/views/compare/show.html.haml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/compare/show.html.haml b/app/views/compare/show.html.haml index d287abe6..f5293dd9 100644 --- a/app/views/compare/show.html.haml +++ b/app/views/compare/show.html.haml @@ -1,3 +1,5 @@ += content_for(:title, "Compare Locations") + .grid-row .column-full %article.c-compare From da8627c758c4357c2980d72b75d0a2e0a4366b04 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 16 Aug 2024 12:50:09 +0100 Subject: [PATCH 045/104] Set title for change history page Both english and welsh versions --- app/views/changelog/_changelog_cy.html.haml | 2 ++ app/views/changelog/_changelog_en.html.haml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/views/changelog/_changelog_cy.html.haml b/app/views/changelog/_changelog_cy.html.haml index e6499f09..ba3e263c 100644 --- a/app/views/changelog/_changelog_cy.html.haml +++ b/app/views/changelog/_changelog_cy.html.haml @@ -1,3 +1,5 @@ += content_for(:title, "Hanes Newid") + %section#main.c-changelog %h1.heading-large Mynegai Prisiau Tai y DU: hanes newid diff --git a/app/views/changelog/_changelog_en.html.haml b/app/views/changelog/_changelog_en.html.haml index a9578a43..bb5ee09e 100644 --- a/app/views/changelog/_changelog_en.html.haml +++ b/app/views/changelog/_changelog_en.html.haml @@ -1,3 +1,5 @@ += content_for(:title, "Change History") + %section#main.c-changelog %h1.heading-large UK House Price Index: change history From 74f50a1b07991506a1f37ef576645af432fe8639 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 16 Aug 2024 12:50:27 +0100 Subject: [PATCH 046/104] Set heading based on page title for change history page Both english and welsh versions --- app/views/changelog/_changelog_cy.html.haml | 3 ++- app/views/changelog/_changelog_en.html.haml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/changelog/_changelog_cy.html.haml b/app/views/changelog/_changelog_cy.html.haml index ba3e263c..fcc0d38b 100644 --- a/app/views/changelog/_changelog_cy.html.haml +++ b/app/views/changelog/_changelog_cy.html.haml @@ -1,7 +1,8 @@ = content_for(:title, "Hanes Newid") %section#main.c-changelog - %h1.heading-large Mynegai Prisiau Tai y DU: hanes newid + %h1.heading-large + = yield(:title) + " - " + I18n.t('common.header.app_title') %h2.heading-medium Ebrill 2023 – Newidiadau i ddaearyddiaeth awdurdodau lleol yn Lloegr diff --git a/app/views/changelog/_changelog_en.html.haml b/app/views/changelog/_changelog_en.html.haml index bb5ee09e..9b75cbca 100644 --- a/app/views/changelog/_changelog_en.html.haml +++ b/app/views/changelog/_changelog_en.html.haml @@ -1,7 +1,8 @@ = content_for(:title, "Change History") %section#main.c-changelog - %h1.heading-large UK House Price Index: change history + %h1.heading-large + = yield(:title) + " - " + I18n.t('common.header.app_title') %h2.heading-medium April 2023 – Changes to local authority geography in England From 9d1afdb4faab88f2af6e19e863523740a21d5719 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 16 Aug 2024 12:50:35 +0100 Subject: [PATCH 047/104] Added changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72769f20..2972282c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 1.7.5 - 2024-08 +- (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) From e902cf3b46453d68eb4cee2603c6253761a9d84a Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 16 Aug 2024 13:56:58 +0100 Subject: [PATCH 048/104] Reverse order of change history heading text --- app/views/changelog/_changelog_cy.html.haml | 2 +- app/views/changelog/_changelog_en.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/changelog/_changelog_cy.html.haml b/app/views/changelog/_changelog_cy.html.haml index fcc0d38b..d3fdc994 100644 --- a/app/views/changelog/_changelog_cy.html.haml +++ b/app/views/changelog/_changelog_cy.html.haml @@ -2,7 +2,7 @@ %section#main.c-changelog %h1.heading-large - = yield(:title) + " - " + I18n.t('common.header.app_title') + = I18n.t('common.header.app_title') + " : " + yield(:title) %h2.heading-medium Ebrill 2023 – Newidiadau i ddaearyddiaeth awdurdodau lleol yn Lloegr diff --git a/app/views/changelog/_changelog_en.html.haml b/app/views/changelog/_changelog_en.html.haml index 9b75cbca..39a7f846 100644 --- a/app/views/changelog/_changelog_en.html.haml +++ b/app/views/changelog/_changelog_en.html.haml @@ -2,7 +2,7 @@ %section#main.c-changelog %h1.heading-large - = yield(:title) + " - " + I18n.t('common.header.app_title') + = I18n.t('common.header.app_title') + " : " + yield(:title) %h2.heading-medium April 2023 – Changes to local authority geography in England From a62b8d429c9923cc4776015e8edfb2cb5f6f6216 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 16 Aug 2024 13:57:10 +0100 Subject: [PATCH 049/104] Reversed order of about page heading text --- app/views/doc/_about_ukhpi_cy.html.haml | 2 +- app/views/doc/_about_ukhpi_en.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/doc/_about_ukhpi_cy.html.haml b/app/views/doc/_about_ukhpi_cy.html.haml index dc3602ad..64c028e7 100644 --- a/app/views/doc/_about_ukhpi_cy.html.haml +++ b/app/views/doc/_about_ukhpi_cy.html.haml @@ -1,7 +1,7 @@ = content_for(:title, "Am") %h1.heading-large - = yield(:title) + " - " + I18n.t('common.header.app_title') + = I18n.t('common.header.app_title') + " : " + yield(:title) %h2.heading-medium Beth sydd wedi ei gynnwys yn Set Ddata’r Mynegai Prisiau Tai? diff --git a/app/views/doc/_about_ukhpi_en.html.haml b/app/views/doc/_about_ukhpi_en.html.haml index b46b0683..d0fcfcf1 100644 --- a/app/views/doc/_about_ukhpi_en.html.haml +++ b/app/views/doc/_about_ukhpi_en.html.haml @@ -1,7 +1,7 @@ = content_for(:title, "About") %h1.heading-large - = yield(:title) + " - " + I18n.t('common.header.app_title') + = I18n.t('common.header.app_title') + " : " + yield(:title) %h2.heading-medium What does the House Price Index Dataset consist of? From f09933bcf88cfe26b0825ba65c77a102badcd578 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 16 Aug 2024 13:59:50 +0100 Subject: [PATCH 050/104] Use translation for browse page title --- app/views/browse/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/browse/show.html.haml b/app/views/browse/show.html.haml index cc8a37e9..afc7f0cf 100644 --- a/app/views/browse/show.html.haml +++ b/app/views/browse/show.html.haml @@ -1,4 +1,4 @@ -= content_for(:title, "Browse") += content_for(:title, t('browse.show.main_heading')) .grid-row .column-full From 39fcbbfd3ba959e802274da31ce0b020a1cb354b Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 16 Aug 2024 14:00:04 +0100 Subject: [PATCH 051/104] Use translation for compare locations page title --- app/views/compare/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/compare/show.html.haml b/app/views/compare/show.html.haml index f5293dd9..fd4f7fc7 100644 --- a/app/views/compare/show.html.haml +++ b/app/views/compare/show.html.haml @@ -1,4 +1,4 @@ -= content_for(:title, "Compare Locations") += content_for(:title, t('compare.show.heading')) .grid-row .column-full From 821c292c7f99ade235303f5e33634dff0e7c42d6 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 16 Aug 2024 14:00:23 +0100 Subject: [PATCH 052/104] Fixed a duplicate character bug --- config/locales/cy.yml | 4 ++-- config/locales/en.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 64210db7..b2f94200 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -238,8 +238,8 @@ cy: dates_picker: select_dates: "newid dyddiad dechrau neu ddiwedd" date_range_prompt: "Newid amrediad y dyddiadau" - start: "Dechrau:" - end: "Diwedd:" + start: "Dechrau" + end: "Diwedd" date: abbr_day_names: diff --git a/config/locales/en.yml b/config/locales/en.yml index b9fa4e5a..668003c1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -238,8 +238,8 @@ en: dates_picker: select_dates: "change start or end date" date_range_prompt: "Change the date range" - start: "Start:" - end: "End:" + start: "Start" + end: "End" # old------------- From f15602933a27d4cc0b6728f96468113ea1783c76 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 16 Aug 2024 14:01:40 +0100 Subject: [PATCH 053/104] Added changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2972282c..3fd76b3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 1.7.5 - 2024-08 +- (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) From 4fd56e22c5b0076dc56fe40a83c1c634aff383a0 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Mon, 19 Aug 2024 12:56:55 +0100 Subject: [PATCH 054/104] Fixed type in aria-label text --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 668003c1..cc62c965 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -172,7 +172,7 @@ en: data_graph: "See data graph" data_table: "See data table" compare: "Compare with location ..." - select_location: "select a diffent location" + select_location: "select a different location" cancel: "cancel" confirm: "confirm" print_table: "print this table" From 2bd8eb721607bdc4acd796f1d78d5954e7116ad9 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Mon, 19 Aug 2024 12:57:01 +0100 Subject: [PATCH 055/104] Added changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fd76b3f..abd71b92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 1.7.5 - 2024-08 +- (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 From 3940ed9f660a6170d35606b6d4d7bccbb2637c67 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Tue, 20 Aug 2024 16:18:32 +0100 Subject: [PATCH 056/104] Fixed CSS bug --- app/assets/stylesheets/_element-rails.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/_element-rails.scss b/app/assets/stylesheets/_element-rails.scss index 098c1767..d1c3132c 100644 --- a/app/assets/stylesheets/_element-rails.scss +++ b/app/assets/stylesheets/_element-rails.scss @@ -56,7 +56,7 @@ table.el-month-table { background-color: $dark-blue; color: white; } - &.hover { + &.hover:not(.selected) { background-color: #e6e6e6; } } From 6e393254bd6364c2c46a687bbf6eae7f748540c1 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Tue, 20 Aug 2024 16:18:39 +0100 Subject: [PATCH 057/104] Added changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index abd71b92..c126b81e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 1.7.5 - 2024-08 +- (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) From 57ca8a40ee0645e4f6fb85805040d245c855ef5b Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Thu, 22 Aug 2024 15:31:36 +0100 Subject: [PATCH 058/104] adds aria label --- CHANGELOG.md | 2 ++ app/views/doc/_about_ukhpi_en.html.haml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c126b81e..bea6bc79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 1.7.5 - 2024-08 +- (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 diff --git a/app/views/doc/_about_ukhpi_en.html.haml b/app/views/doc/_about_ukhpi_en.html.haml index d0fcfcf1..3de4af77 100644 --- a/app/views/doc/_about_ukhpi_en.html.haml +++ b/app/views/doc/_about_ukhpi_en.html.haml @@ -146,7 +146,7 @@ %h2.heading-medium SPARQL %p Alongside the report builder we have created a - = link_to "SPARQL query page", "/app/qonsole" + = link_to("SPARQL query page", "/app/qonsole", 'aria-label' => 'SPARQL query page') that you can use to try out some example SPARQL queries or create your own. %p We also have made a SPARQL endpoint available. You can use the following URL address in From c47575457cd280803d0af675cf2508fd1cc75069 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Fri, 23 Aug 2024 15:16:44 +0100 Subject: [PATCH 059/104] build: updated .gitignore now includes ignoring byebug history as well as sets the tmp directory ignore to be anywhere, not just at the project root --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f6e2720e..f2d0b214 100644 --- a/.gitignore +++ b/.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 From b50e3e960b1996a6fc18beea070c5802cc1c0ff3 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Fri, 23 Aug 2024 15:23:08 +0100 Subject: [PATCH 060/104] style: rubocop update 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! --- .rubocop.yml | 144 +++++++++++------- app/controllers/application_controller.rb | 9 +- app/controllers/browse_controller.rb | 4 +- app/controllers/compare_controller.rb | 2 +- .../concerns/cube_data_model/cube_measure.rb | 2 +- app/models/data_view.rb | 2 +- app/models/latest_values_command.rb | 4 +- app/models/user_compare_selections.rb | 2 +- app/models/user_selections.rb | 2 +- app/presenters/compare_locations_presenter.rb | 4 +- app/presenters/download_presenter.rb | 2 +- app/presenters/landing_state.rb | 2 +- app/presenters/print_presenter.rb | 4 +- test/services/query_command_test.rb | 2 +- 14 files changed, 108 insertions(+), 77 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 85503400..e0613b4c 100644 --- a/.rubocop.yml +++ b/.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 diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index c2acf040..dd2b8a0a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -18,7 +18,7 @@ def log_request_result private - # rubocop:disable Metrics/MethodLength, Metrics/AbcSize + # rubocop:disable Metrics/AbcSize def detailed_request_log(duration) env = request.env @@ -46,15 +46,14 @@ def detailed_request_log(duration) Rails.logger.info(JSON.generate(log_fields)) end end - # rubocop:enable Metrics/MethodLength, Metrics/AbcSize + # rubocop:enable Metrics/AbcSize # Set the user's preferred locale. An explicit locale set via # the URL param `lang` is preeminent, otherwise we look to the # user's preferred language specified via browser headers def set_locale - user_locale = - params['lang'] || - http_accept_language.compatible_language_from(I18n.available_locales) + user_locale = params['lang'] + user_locale ||= http_accept_language.compatible_language_from(I18n.available_locales) I18n.locale = user_locale if Rails.application.config.welsh_language_enabled end diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 0511a785..8b7f2a3e 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -3,7 +3,7 @@ # Controller for the main user experience of browsing the UKHPI statistics. # Usually the primary interaction will be via JavaScript and XHR, but we also # support non-JS access by setting browse preferences in the `edit` action. -class BrowseController < ApplicationController # rubocop:disable Metrics/ClassLength +class BrowseController < ApplicationController layout 'webpack_application' def show @@ -128,7 +128,7 @@ def view_result(view_state) }.merge(new_params)) end - def render_request_error(user_selections, status) # rubocop:disable Metrics/MethodLength + def render_request_error(user_selections, status) respond_to do |format| @view_state = { user_selections: user_selections } request_status = status == 400 ? :bad_request : :internal_server_error diff --git a/app/controllers/compare_controller.rb b/app/controllers/compare_controller.rb index a66da0ca..4998baf9 100644 --- a/app/controllers/compare_controller.rb +++ b/app/controllers/compare_controller.rb @@ -31,7 +31,7 @@ def render_print render 'compare/print', layout: 'print' end - def perform_query(user_compare_selections) # rubocop:disable Metrics/MethodLength + def perform_query(user_compare_selections) query_results = {} base_selection = UserSelections.new( __safe_params: { diff --git a/app/models/concerns/cube_data_model/cube_measure.rb b/app/models/concerns/cube_data_model/cube_measure.rb index 99ed8a96..d6e7c827 100644 --- a/app/models/concerns/cube_data_model/cube_measure.rb +++ b/app/models/concerns/cube_data_model/cube_measure.rb @@ -33,7 +33,7 @@ def decimal_range? range.include?(RDF::XSD.decimal) end - def unit_type # rubocop:disable Metrics/MethodLength + def unit_type if scalar? :scalar elsif percentage? diff --git a/app/models/data_view.rb b/app/models/data_view.rb index 52e24037..f2844e46 100644 --- a/app/models/data_view.rb +++ b/app/models/data_view.rb @@ -7,7 +7,7 @@ # a view of the `averagePrice` indicator, together with the relevant dates, # location and other options, and access to the underlying data, to enable # the renderer to draw the display -class DataView # rubocop:disable Metrics/ClassLength +class DataView include Rails.application.routes.url_helpers attr_reader :user_selections, :query_result, :indicator, :theme diff --git a/app/models/latest_values_command.rb b/app/models/latest_values_command.rb index 965bdcc3..aaa43dad 100644 --- a/app/models/latest_values_command.rb +++ b/app/models/latest_values_command.rb @@ -14,7 +14,7 @@ def perform_query(service = nil) private - def service_api(service) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize + def service_api(service) # rubocop:disable Metrics/AbcSize service || dataset(:ukhpi) rescue Faraday::ConnectionFailed => e Rails.logger.error { 'Failed to connect to UK HPI ' } @@ -33,7 +33,7 @@ def service_api(service) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize nil end - def run_query(hpi) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize + def run_query(hpi) # rubocop:disable Metrics/AbcSize success = true query = add_date_range_constraint(base_query) query = add_location_constraint(query) diff --git a/app/models/user_compare_selections.rb b/app/models/user_compare_selections.rb index 8f1a693d..f2323149 100644 --- a/app/models/user_compare_selections.rb +++ b/app/models/user_compare_selections.rb @@ -78,7 +78,7 @@ def search? delegate :to_h, to: :params - def as_json # rubocop:disable Metrics/MethodLength, Metrics/AbcSize + def as_json # rubocop:disable Metrics/AbcSize { from: { date: from_date }.to_json, to: { date: to_date }.to_json, diff --git a/app/models/user_selections.rb b/app/models/user_selections.rb index 53300b5f..e8fc2af1 100644 --- a/app/models/user_selections.rb +++ b/app/models/user_selections.rb @@ -8,7 +8,7 @@ # standard set of statistics is presented if there is no information in the # user parameters yet. This functionality combines the previous # `models/UserPreferences` and `presenters/Aspects` -class UserSelections # rubocop:disable Metrics/ClassLength +class UserSelections include UserChoices include UserSelectionValidations include UserLanguage diff --git a/app/presenters/compare_locations_presenter.rb b/app/presenters/compare_locations_presenter.rb index 09038185..509869df 100644 --- a/app/presenters/compare_locations_presenter.rb +++ b/app/presenters/compare_locations_presenter.rb @@ -4,7 +4,7 @@ # Presenter class that encapsulates the behaviour of mapping the user-selections # to side-by-side comparisons for different areas -class CompareLocationsPresenter # rubocop:disable Metrics/ClassLength +class CompareLocationsPresenter include I18n include LocationsTable @@ -25,7 +25,7 @@ def initialize(user_compare_selections, query_results) delegate :as_json, to: :user_compare_selections delegate :selected_locations, to: :user_compare_selections - def headline_summary # rubocop:disable Metrics/AbcSize, Metrics/MethodLength + def headline_summary # rubocop:disable Metrics/AbcSize ind = I18n.t("indicator.#{indicator.slug}") stat = I18n.t("statistic.#{statistic.label_key}").downcase from = I18n.l(user_compare_selections.from_date, format: '%B %Y') diff --git a/app/presenters/download_presenter.rb b/app/presenters/download_presenter.rb index 511cc377..f69a57e8 100644 --- a/app/presenters/download_presenter.rb +++ b/app/presenters/download_presenter.rb @@ -116,7 +116,7 @@ def all_themes ukhpi.themes.values.map(&:slug) end - def sort_results_by_date_and_location # rubocop:disable Metrics/MethodLength + def sort_results_by_date_and_location @results.sort! do |result0, result1| date0 = result0['ukhpi:refMonth']['@value'] date1 = result1['ukhpi:refMonth']['@value'] diff --git a/app/presenters/landing_state.rb b/app/presenters/landing_state.rb index 04b5e02c..7cdf0155 100644 --- a/app/presenters/landing_state.rb +++ b/app/presenters/landing_state.rb @@ -72,7 +72,7 @@ def to_value(val) DataServicesApi::Value.new(val.symbolize_keys) end - def format_percentage(change) # rubocop:disable Metrics/MethodLength + def format_percentage(change) if change == 'unknown' change elsif change.zero? diff --git a/app/presenters/print_presenter.rb b/app/presenters/print_presenter.rb index 6e9d5e61..966b5acc 100644 --- a/app/presenters/print_presenter.rb +++ b/app/presenters/print_presenter.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # A presenter for the printable view, based on the download view presenter -class PrintPresenter < DownloadPresenter # rubocop:disable Metrics/ClassLength +class PrintPresenter < DownloadPresenter include ActionView::Helpers::NumberHelper PRINT_COLUMNS = [ @@ -120,7 +120,7 @@ def user_selection_columns # @return An array of the given statistic paired with the currently selected # indicators - def statistic_indicator_columns(stat) # rubocop:disable Metrics/MethodLength + def statistic_indicator_columns(stat) selected_indicators.map do |ind| DownloadColumn.new( ind: ind, diff --git a/test/services/query_command_test.rb b/test/services/query_command_test.rb index 90999250..b3c53a8c 100644 --- a/test/services/query_command_test.rb +++ b/test/services/query_command_test.rb @@ -10,7 +10,7 @@ def query(query) end end -def validate_json(json) # rubocop:disable Metrics/MethodLength +def validate_json(json) _(json).must_match_json_expression( '@and': [ From beb65501ac0f6c1e069b9843fd75a2b124784040 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 27 Aug 2024 12:43:26 +0100 Subject: [PATCH 061/104] feat: adding puma-metrics gem --- Gemfile | 1 + Gemfile.lock | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 91c45ccc..e5c746ba 100644 --- a/Gemfile +++ b/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' diff --git a/Gemfile.lock b/Gemfile.lock index d98662c5..c69f14bf 100644 --- a/Gemfile.lock +++ b/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,7 @@ 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) oj (3.14.2) parallel (1.22.1) @@ -207,6 +205,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 +362,7 @@ GEM railties PLATFORMS - ruby + x86_64-darwin-21 DEPENDENCIES byebug @@ -388,6 +389,7 @@ DEPENDENCIES oj (= 3.14.2) prometheus-client (~> 4.0) puma + puma-metrics rails (~> 6.0) rdf-turtle rubocop From ac410b30c66f71f3b2d20b1baf69a7bcda9d3f42 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 27 Aug 2024 12:44:53 +0100 Subject: [PATCH 062/104] refactor: excluding prometheus metrics from testing environment as per all examples online this prevents the metrics from including any testing in calculations --- config.ru | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/config.ru b/config.ru index 841c9832..b88c1e24 100644 --- a/config.ru +++ b/config.ru @@ -6,11 +6,13 @@ require_relative 'config/environment' require ::File.expand_path('config/environment', __dir__) -require 'prometheus/middleware/collector' -require 'prometheus/middleware/exporter' +unless Rails.env.test? + require 'prometheus/middleware/collector' + require 'prometheus/middleware/exporter' -use Prometheus::Middleware::Collector -use Prometheus::Middleware::Exporter + use Prometheus::Middleware::Collector + use Prometheus::Middleware::Exporter +end if ENV['RAILS_ENV'] == 'production' map Rails.application.config.relative_url_root || '/' do From 4e5e8c8ae8f531e1220251671627b0bc1a621fe9 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 27 Aug 2024 12:46:28 +0100 Subject: [PATCH 063/104] feat: adds process_threads guage to prometheus metrics alongside isolating thread counts to specific status' as per the thread documentation as well as minor rubocop rule removal based on updated ruleset; updated approach to https://github.com/epimorphics/hmlr-linked-data/issues/142 --- .../action_dispatch_prometheus_subscriber.rb | 50 ++++++++++++++++++- app/subscribers/api_prometheus_subscriber.rb | 2 +- config/initializers/prometheus.rb | 7 +++ 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/app/subscribers/action_dispatch_prometheus_subscriber.rb b/app/subscribers/action_dispatch_prometheus_subscriber.rb index 5f02b5e0..97ea1939 100644 --- a/app/subscribers/action_dispatch_prometheus_subscriber.rb +++ b/app/subscribers/action_dispatch_prometheus_subscriber.rb @@ -4,11 +4,57 @@ class ActionDispatchPrometheusSubscriber < ActiveSupport::Subscriber attach_to :action_dispatch - def request(_event) + # rubocop:disable Metrics/AbcSize, Metrics/MethodLength + def process_action(_event) mem = GetProcessMem.new - Prometheus::Client.registry .get(:memory_used_mb) .set(mem.mb) + # description: 'Thread is aborting' + Prometheus::Client.registry + .get(:process_threads) + .set( + Thread.list.select { |thread| thread.status == 'aborting' }.count, + labels: { + status: 'aborting' + } + ) + # description: 'Thread is sleeping or waiting on I/O' + Prometheus::Client.registry + .get(:process_threads) + .set( + Thread.list.select { |thread| thread.status == 'sleep' }.count, + labels: { + status: 'sleep' + } + ) + # description: 'Thread is executing' + Prometheus::Client.registry + .get(:process_threads) + .set( + Thread.list.select { |thread| thread.status == 'run' }.count, + labels: { + status: 'run' + } + ) + # description: 'Thread is terminated normally' + Prometheus::Client.registry + .get(:process_threads) + .set( + Thread.list.select { |thread| thread.status == false }.count, + labels: { + status: 'false' + } + ) + # description: 'Thread is terminated with an exception' + Prometheus::Client.registry + .get(:process_threads) + .set( + Thread.list.select { |thread| thread.status.nil? }.count, + labels: { + status: 'nil' + } + ) end + # rubocop:enable Metrics/AbcSize, Metrics/MethodLength end diff --git a/app/subscribers/api_prometheus_subscriber.rb b/app/subscribers/api_prometheus_subscriber.rb index 7b8b8678..f2a54a8d 100644 --- a/app/subscribers/api_prometheus_subscriber.rb +++ b/app/subscribers/api_prometheus_subscriber.rb @@ -4,7 +4,7 @@ class ApiPrometheusSubscriber < ActiveSupport::Subscriber attach_to :api - def response(event) # rubocop:disable Metrics/MethodLength + def response(event) response = event.payload[:response] duration = event.payload[:duration] diff --git a/config/initializers/prometheus.rb b/config/initializers/prometheus.rb index c802544b..e7ea4e45 100644 --- a/config/initializers/prometheus.rb +++ b/config/initializers/prometheus.rb @@ -35,6 +35,13 @@ docstring: 'Process memory usage in mb' ) +prometheus.gauge( + :process_threads, + docstring: 'The number of process threads', + labels: [:status], + preset_labels: { status: 'total' } +) + # Prometheus histograms prometheus.histogram( :api_response_times, From e5d3bc147fc16a6502a67329f0a2e97cdc5a8b1b Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 27 Aug 2024 12:51:51 +0100 Subject: [PATCH 064/104] a11y: updates to page titles implements revised approach to page titles mirrored on other suite apps, as well as fixes white space typo in some concatenated page titles --- app/views/changelog/_changelog_cy.html.haml | 2 +- app/views/changelog/_changelog_en.html.haml | 2 +- app/views/compare/show.html.haml | 2 +- app/views/doc/_about_ukhpi_cy.html.haml | 2 +- app/views/doc/_about_ukhpi_en.html.haml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/changelog/_changelog_cy.html.haml b/app/views/changelog/_changelog_cy.html.haml index d3fdc994..c671b038 100644 --- a/app/views/changelog/_changelog_cy.html.haml +++ b/app/views/changelog/_changelog_cy.html.haml @@ -2,7 +2,7 @@ %section#main.c-changelog %h1.heading-large - = I18n.t('common.header.app_title') + " : " + yield(:title) + = "#{I18n.t('common.header.app_title')}: #{yield(:title)}" %h2.heading-medium Ebrill 2023 – Newidiadau i ddaearyddiaeth awdurdodau lleol yn Lloegr diff --git a/app/views/changelog/_changelog_en.html.haml b/app/views/changelog/_changelog_en.html.haml index 39a7f846..f34b9217 100644 --- a/app/views/changelog/_changelog_en.html.haml +++ b/app/views/changelog/_changelog_en.html.haml @@ -2,7 +2,7 @@ %section#main.c-changelog %h1.heading-large - = I18n.t('common.header.app_title') + " : " + yield(:title) + = "#{I18n.t('common.header.app_title')}: #{yield(:title)}" %h2.heading-medium April 2023 – Changes to local authority geography in England diff --git a/app/views/compare/show.html.haml b/app/views/compare/show.html.haml index fd4f7fc7..8d891d2f 100644 --- a/app/views/compare/show.html.haml +++ b/app/views/compare/show.html.haml @@ -4,7 +4,7 @@ .column-full %article.c-compare %h1.o-heading--2 - = t('compare.show.heading') + = yield(:title) %p.u-muted = t('compare.show.prompt') diff --git a/app/views/doc/_about_ukhpi_cy.html.haml b/app/views/doc/_about_ukhpi_cy.html.haml index 64c028e7..33ad83ef 100644 --- a/app/views/doc/_about_ukhpi_cy.html.haml +++ b/app/views/doc/_about_ukhpi_cy.html.haml @@ -1,7 +1,7 @@ = content_for(:title, "Am") %h1.heading-large - = I18n.t('common.header.app_title') + " : " + yield(:title) + = "#{I18n.t('common.header.app_title')}: #{yield(:title)}" %h2.heading-medium Beth sydd wedi ei gynnwys yn Set Ddata’r Mynegai Prisiau Tai? diff --git a/app/views/doc/_about_ukhpi_en.html.haml b/app/views/doc/_about_ukhpi_en.html.haml index d0fcfcf1..a2b5ba0c 100644 --- a/app/views/doc/_about_ukhpi_en.html.haml +++ b/app/views/doc/_about_ukhpi_en.html.haml @@ -1,7 +1,7 @@ = content_for(:title, "About") %h1.heading-large - = I18n.t('common.header.app_title') + " : " + yield(:title) + = "#{I18n.t('common.header.app_title')}: #{yield(:title)}" %h2.heading-medium What does the House Price Index Dataset consist of? From 1cc42a482b218a11f052341ade7bf540cc86494d Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 27 Aug 2024 13:00:59 +0100 Subject: [PATCH 065/104] a11y: fixes contrast for location selection via additional styling and updated 3rd-party element use specific to ticket [#408](https://github.com/epimorphics/ukhpi/issues/408) alongside adding missing aria-attributes required for assisted use --- .../stylesheets/_data-view-download.scss | 24 ++++- app/assets/stylesheets/_element-rails.scss | 7 +- app/assets/stylesheets/_gov_uk.scss | 6 +- app/assets/stylesheets/_leaflet-rrose.scss | 2 +- app/assets/stylesheets/_lr-common.scss | 3 +- app/assets/stylesheets/a11y.scss | 101 ++++++++++++++++++ app/assets/stylesheets/application.scss | 3 +- .../components/compare-locations.vue | 6 +- app/javascript/components/select-location.vue | 14 +-- 9 files changed, 150 insertions(+), 16 deletions(-) create mode 100644 app/assets/stylesheets/a11y.scss diff --git a/app/assets/stylesheets/_data-view-download.scss b/app/assets/stylesheets/_data-view-download.scss index c8e09e53..30825f78 100644 --- a/app/assets/stylesheets/_data-view-download.scss +++ b/app/assets/stylesheets/_data-view-download.scss @@ -13,14 +13,32 @@ text-decoration: none; } - &__button, &__button:visited, &__button:link, &__button:focus, &__button:link:focus { - color: white; - background-color: $dark-blue; + &__button{ + &:visited, &:link { + color: white; + background-color: $dark-blue; + &:hover, &:focus, &:visited { + color: white; + background-color: $dark-blue-hover; + } + } } } .c-compare__download-link { @extend .button; + color: white; background-color: $dark-blue; font-size: 1.5rem; + &:hover, &:focus, &:visited { + color: white; + background-color: $dark-blue-hover; + } +} + +.c-compare__print-link { + color: $dark-blue; + &:hover, &:focus, &:visited { + color: $dark-blue-hover; + } } diff --git a/app/assets/stylesheets/_element-rails.scss b/app/assets/stylesheets/_element-rails.scss index d1c3132c..d4f16781 100644 --- a/app/assets/stylesheets/_element-rails.scss +++ b/app/assets/stylesheets/_element-rails.scss @@ -20,8 +20,8 @@ } .el-table .cell { - word-break: normal; -ms-word-break: normal; + word-break: normal; } .el-button--default { @@ -30,6 +30,11 @@ .el-button--primary { background-color: $dark-blue; + border-color: $dark-blue; + &:any-link, &:focus, &:hover { + background-color: $dark-blue-hover; + border-color: $dark-blue-hover; + } } .el-date-editor { diff --git a/app/assets/stylesheets/_gov_uk.scss b/app/assets/stylesheets/_gov_uk.scss index a1be390f..fef7be08 100644 --- a/app/assets/stylesheets/_gov_uk.scss +++ b/app/assets/stylesheets/_gov_uk.scss @@ -17,8 +17,12 @@ @import 'elements/reset'; @import "elements/helpers"; // Helper functions and classes +$govuk-brand-colour: #1d70b8; +$govuk-brand-hover-colour: #003078; + $grey-8: #f0f0f0; -$dark-blue: #003078; +$dark-blue: $govuk-brand-colour; +$dark-blue-hover: $govuk-brand-hover-colour; @import "elements/govuk-template-base"; // HTML elements, set by the GOV.UK template diff --git a/app/assets/stylesheets/_leaflet-rrose.scss b/app/assets/stylesheets/_leaflet-rrose.scss index 5a93df15..41bd2a1a 100644 --- a/app/assets/stylesheets/_leaflet-rrose.scss +++ b/app/assets/stylesheets/_leaflet-rrose.scss @@ -103,9 +103,9 @@ a.leaflet-rrose-close-button:hover { .leaflet-rrose-content-wrapper, .leaflet-rrose-tip { background: white; - box-shadow: 0 3px 10px #888; -moz-box-shadow: 0 3px 10px #888; -webkit-box-shadow: 0 3px 14px #999; + box-shadow: 0 3px 10px #888; } .leaflet-rrose-content-wrapper { diff --git a/app/assets/stylesheets/_lr-common.scss b/app/assets/stylesheets/_lr-common.scss index cd3fd652..c814c092 100644 --- a/app/assets/stylesheets/_lr-common.scss +++ b/app/assets/stylesheets/_lr-common.scss @@ -38,8 +38,8 @@ ol.numbered { input[type=checkbox], input[type=radio] { - transform: scale(1.5); -webkit-transform: scale(1.5); + transform: scale(1.5); } /* objects */ @@ -261,3 +261,4 @@ input[type=radio] { :focus, a:focus { outline: 2px solid $focus-colour !important; } + diff --git a/app/assets/stylesheets/a11y.scss b/app/assets/stylesheets/a11y.scss new file mode 100644 index 00000000..0acb004c --- /dev/null +++ b/app/assets/stylesheets/a11y.scss @@ -0,0 +1,101 @@ +/* Created in 2024-08 accessibility review ~ JRH */ +$govuk-brand-colour: #1d70b8; +$govuk-brand-hover-colour: #003078; +$govuk-brand-disabled-colour: lighten( $govuk-brand-colour, 40% ); + + +@mixin disabled-button { + color: #606266; + background-color: $govuk-brand-disabled-colour; + border-color: $govuk-brand-disabled-colour; + opacity: 0.4; + cursor: not-allowed; +} + +@mixin hidden-radio { + opacity: 0; + outline: 0; + position: absolute; + z-index: -1; +} + +button, +.button{ + &.el-button { + &--primary{ + background-color: $govuk-brand-colour; + border-color: $govuk-brand-colour; + &:hover, + &:focus { + background-color: $govuk-brand-hover-colour; + border-color: $govuk-brand-hover-colour; + } + &.is-disabled { + @include disabled-button; + &:active, + &:focus, + &:hover { + @include disabled-button; + } + } + } + } +} + +div { + &.el-radio-group { + &[role="radiogroup"] { + [role="radio"]{ + &.el-radio-button { + position: relative; + display: inline-block; + width: 100%; + outline: 0; + width: 100%; + margin: 0; + padding: 0; + &.is-checked { + .el-radio__label { + color: #FFF; + background-color: $govuk-brand-colour; + } + } + + .el-radio__input { + @include hidden-radio; + .el-radio__inner{ + display: none; + } + } + .el-radio__label { + width: 100%; + border: 0; + border-radius: 0; + color: #000000; + display: inline-block; + line-height: 2.0; + text-align: center; + padding: 0.75rem 1.4rem; + font-size: calc(1.0rem + 0.2vw); // maintain text size relative to viewport width + background-color: #FFF; + font-weight: 500; + text-align: center; + box-sizing: border-box; + &:hover, &:focus, &:visited { + background-color: $govuk-brand-hover-colour; + color: #FFF; + } + &:active { + background-color: $govuk-brand-hover-colour; + color: $govuk-brand-colour; + } + } + [aria-hidden="true"] { + @include hidden-radio; + } + } + } + } + } +} + diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 5672fe70..a135d04d 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -24,4 +24,5 @@ 'ukhpi-location-select', 'actions', 'skip_to_main', - 'cookie-banner'; + 'cookie-banner', + 'a11y'; diff --git a/app/javascript/components/compare-locations.vue b/app/javascript/components/compare-locations.vue index e3224edd..41d8a323 100644 --- a/app/javascript/components/compare-locations.vue +++ b/app/javascript/components/compare-locations.vue @@ -10,7 +10,8 @@ :key='item.slug' :label='item.label' :value='item.slug' - :disabled='isDisabledIndicator(item.slug)'> + :disabled='isDisabledIndicator(item.slug)' + :aria-disabled='isDisabledIndicator(item.slug)'> @@ -26,7 +27,8 @@ :key='item.slug' :label='item.label' :value='item.slug' - :disabled='isDisabledStatistic(item.slug)'> + :disabled='isDisabledStatistic(item.slug)' + :aria-disabled='isDisabledStatistic(item.slug)'> diff --git a/app/javascript/components/select-location.vue b/app/javascript/components/select-location.vue index 72694eda..36e3aa6e 100644 --- a/app/javascript/components/select-location.vue +++ b/app/javascript/components/select-location.vue @@ -70,12 +70,12 @@ {{ $t("js.location.show_on_map") }} @@ -87,6 +87,8 @@ type='primary' @click='onSaveChanges' :disabled='!allowConfirm' + :aria-disabled='!allowConfirm' + :aria-label='$t("js.action.confirm")' >{{ $t('js.action.confirm') }} From cc0322b0ffc73c0cfd1adcee9035bfea951daf75 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 27 Aug 2024 13:53:02 +0100 Subject: [PATCH 066/104] refactor: adjusted code layout for readability --- app/controllers/application_controller.rb | 49 ++++++++++++++--------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index dd2b8a0a..34285f77 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -6,9 +6,30 @@ class ApplicationController < ActionController::Base # For APIs, you may want to use :null_session instead. protect_from_forgery with: :exception - before_action :set_locale, :change_default_caching_policy + before_action :set_locale + before_action :change_default_caching_policy around_action :log_request_result + + # Set the user's preferred locale. An explicit locale set via + # the URL param `lang` is preeminent, otherwise we look to the + # user's preferred language specified via browser headers + def set_locale + user_locale = params['lang'] + user_locale ||= http_accept_language.compatible_language_from(I18n.available_locales) + + I18n.locale = user_locale if Rails.application.config.welsh_language_enabled + end + + # * Set cache control headers for HMLR apps to be public and cacheable + # * UHPI needs to be shorter to avoid delay (in users cache) on the + # * publication deadline so it is set for 2 minutes (120 seconds) + # Sets the default `Cache-Control` header for all requests, + # unless overridden in the action + def change_default_caching_policy + expires_in 2.minutes, public: true, must_revalidate: true if Rails.env.production? + end + def log_request_result start = Process.clock_gettime(Process::CLOCK_MONOTONIC, :microsecond) yield @@ -38,7 +59,7 @@ def detailed_request_log(duration) case response.status when 500..599 - log_fields[:message] = env['action_dispatch.exception'] + log_fields[:message] = env['action_dispatch.exception'].to_s Rails.logger.error(JSON.generate(log_fields)) when 400..499 Rails.logger.warn(JSON.generate(log_fields)) @@ -48,22 +69,12 @@ def detailed_request_log(duration) end # rubocop:enable Metrics/AbcSize - # Set the user's preferred locale. An explicit locale set via - # the URL param `lang` is preeminent, otherwise we look to the - # user's preferred language specified via browser headers - def set_locale - user_locale = params['lang'] - user_locale ||= http_accept_language.compatible_language_from(I18n.available_locales) - - I18n.locale = user_locale if Rails.application.config.welsh_language_enabled - end - - # * Set cache control headers for HMLR apps to be public and cacheable - # * UHPI needs to be shorter to avoid delay (in users cache) on the - # * publication deadline so it is set for 2 minutes (120 seconds) - # Set the default `Cache-Control` header for all requests, - # unless overridden in the action - def change_default_caching_policy - expires_in 2.minutes, public: true, must_revalidate: true if Rails.env.production? + # Notify subscriber(s) of an internal error event with the payload of the + # exception once done + # @param [Exception] exp the exception that caused the error + # @return [ActiveSupport::Notifications::Event] provides an object-oriented + # interface to the event + def instrument_internal_error(exception) + ActiveSupport::Notifications.instrument('internal_error.application', exception: exception) end end From af02f6a25e7ece56cf9752b1b1f896d3f5ba92bd Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 27 Aug 2024 14:26:58 +0100 Subject: [PATCH 067/104] style: erroneous rubocop rule removal post linting Metrics/MethodLength no longer needs to be disabled with new ruleset --- app/subscribers/action_dispatch_prometheus_subscriber.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/subscribers/action_dispatch_prometheus_subscriber.rb b/app/subscribers/action_dispatch_prometheus_subscriber.rb index 97ea1939..8e0e428a 100644 --- a/app/subscribers/action_dispatch_prometheus_subscriber.rb +++ b/app/subscribers/action_dispatch_prometheus_subscriber.rb @@ -4,7 +4,7 @@ class ActionDispatchPrometheusSubscriber < ActiveSupport::Subscriber attach_to :action_dispatch - # rubocop:disable Metrics/AbcSize, Metrics/MethodLength + # rubocop:disable Metrics/AbcSize def process_action(_event) mem = GetProcessMem.new Prometheus::Client.registry @@ -56,5 +56,5 @@ def process_action(_event) } ) end - # rubocop:enable Metrics/AbcSize, Metrics/MethodLength + # rubocop:enable Metrics/AbcSize end From 18fc9479a5d1d3f449ebd1999d4e1dc294f41536 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 27 Aug 2024 14:28:43 +0100 Subject: [PATCH 068/104] fix: only apply language parameter if it exists --- app/views/common/_footer.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/common/_footer.html.haml b/app/views/common/_footer.html.haml index 6dcae841..c6aa9b6a 100644 --- a/app/views/common/_footer.html.haml +++ b/app/views/common/_footer.html.haml @@ -16,9 +16,9 @@ %a{:href => "https://www.gov.uk/land-registry-public-data"} = t('common.footer.public_data') %li.u-print-hidden - = link_to(t('common.footer.accessibility'), "#{Rails.application.config.accessibility_document_path}?lang=#{I18n.locale}") + = link_to(t('common.footer.accessibility'),"#{Rails.application.config.accessibility_document_path}#{"?lang=#{I18n.locale}" if params[:lang].present?}") %li.u-print-hidden - = link_to(t('common.footer.privacy'), "#{Rails.application.config.privacy_document_path}?lang=#{I18n.locale}") + = link_to(t('common.footer.privacy'),"#{Rails.application.config.privacy_document_path}#{"?lang=#{I18n.locale}" if params[:lang].present?}") .ogl.open-government-licence %p.logo.u-print-hidden %a{href: t('common.footer.ogl_url'), rel:"license"} From 0fb4bacde5abe12c948f5378d47e8b0f73ab7db6 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 27 Aug 2024 14:30:05 +0100 Subject: [PATCH 069/104] refactor: add puma stats to footer in development --- app/views/common/_footer.html.haml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/views/common/_footer.html.haml b/app/views/common/_footer.html.haml index c6aa9b6a..2edd6210 100644 --- a/app/views/common/_footer.html.haml +++ b/app/views/common/_footer.html.haml @@ -29,3 +29,8 @@ %p.u-muted--footer = t('common.footer.application_release') = Version::VERSION + - if Rails.env.development? + %pre + [puma stats: + = JSON.pretty_generate(JSON.parse(Puma.stats, symbolize_names: true)) + , time: #{Time.now}] From 43a6e70c20291c73a01e4d93d524cfa56fda15d7 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 27 Aug 2024 15:20:41 +0100 Subject: [PATCH 070/104] feat: add exception to prometheus metrics --- app/controllers/exceptions_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/exceptions_controller.rb b/app/controllers/exceptions_controller.rb index 8258309f..11c20945 100644 --- a/app/controllers/exceptions_controller.rb +++ b/app/controllers/exceptions_controller.rb @@ -10,6 +10,8 @@ def render_error status_code = ActionDispatch::ExceptionWrapper.new(env, exception).status_code sentry_code = maybe_report_to_sentry(exception, status_code) + # add the exception to the prometheus metrics + instrument_internal_error(exception) render :error_page, locals: { status: status_code, sentry_code: sentry_code }, From ed940d089eb485866c78bebbd2d5ab9d62a560bd Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 27 Aug 2024 16:48:03 +0100 Subject: [PATCH 071/104] docs: Updated CHANGELOG --- CHANGELOG.md | 63 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 49 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c126b81e..3680d10f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,26 +2,61 @@ ## 1.7.5 - 2024-08 -- (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) +- (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) - (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) 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 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) +- (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-04-19 From afedd1db81b5566ab588db25f1b99ff925037080 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 27 Aug 2024 16:51:42 +0100 Subject: [PATCH 072/104] docs: Updated CHANGELOG --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3680d10f..cc9faae6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 1.7.5 - 2024-08 +- (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) From 3703db8cda70c41ef3d88b937686f656263ec5fc Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Tue, 27 Aug 2024 16:57:47 +0100 Subject: [PATCH 073/104] docs: updated docstring in prometheus initialiser --- config/initializers/prometheus.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/prometheus.rb b/config/initializers/prometheus.rb index e7ea4e45..c8c06056 100644 --- a/config/initializers/prometheus.rb +++ b/config/initializers/prometheus.rb @@ -37,7 +37,7 @@ prometheus.gauge( :process_threads, - docstring: 'The number of process threads', + docstring: 'The number of process threads, labelled by status', labels: [:status], preset_labels: { status: 'total' } ) From c2f67f677f5f0325732e173ac13093d94c19d86c Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Wed, 28 Aug 2024 09:29:28 +0100 Subject: [PATCH 074/104] style: updated list item hover state to match new colour scheme --- app/assets/stylesheets/_element-rails.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/_element-rails.scss b/app/assets/stylesheets/_element-rails.scss index d4f16781..c9f1d6a9 100644 --- a/app/assets/stylesheets/_element-rails.scss +++ b/app/assets/stylesheets/_element-rails.scss @@ -62,6 +62,7 @@ table.el-month-table { color: white; } &.hover:not(.selected) { - background-color: #e6e6e6; + background-color: $dark-blue-hover; + color: white; } } From 87da8aba4f02d70df598db371384954e2c4c29f6 Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Wed, 28 Aug 2024 11:45:45 +0100 Subject: [PATCH 075/104] fixes aria label issue --- CHANGELOG.md | 2 +- app/views/compare/show.html.haml | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bea6bc79..9efb6e88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,10 @@ ## 1.7.5 - 2024-08 +- (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 diff --git a/app/views/compare/show.html.haml b/app/views/compare/show.html.haml index fd4f7fc7..ec7a95f7 100644 --- a/app/views/compare/show.html.haml +++ b/app/views/compare/show.html.haml @@ -47,9 +47,10 @@ %input{ type: 'hidden', name: 'location[]', value: location.gss } %li.c-compare__add-location - = t('compare.show.add_location') - %input{ type: 'text', name: 'location-term', value: @view_state.search_term } - %button{ type: 'submit', value: 'search', name: 'form-action' } + %label{ for: 'location-term'} + = t('compare.show.add_location') + %input{ id: 'location-term', type: 'text', name: 'location-term', "aria-label": "Location search", value: @view_state.search_term } + %button{ type: 'submit', value: 'search', name: 'form-action', "aria-label": "Search for location" } = t('action.search') - if @view_state.search_results From 6a02a37137e804799727f0e23bd3606b62a67543 Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Wed, 28 Aug 2024 14:15:00 +0100 Subject: [PATCH 076/104] updates aria label --- app/views/compare/show.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/compare/show.html.haml b/app/views/compare/show.html.haml index ec7a95f7..32cf99c9 100644 --- a/app/views/compare/show.html.haml +++ b/app/views/compare/show.html.haml @@ -49,8 +49,8 @@ %li.c-compare__add-location %label{ for: 'location-term'} = t('compare.show.add_location') - %input{ id: 'location-term', type: 'text', name: 'location-term', "aria-label": "Location search", value: @view_state.search_term } - %button{ type: 'submit', value: 'search', name: 'form-action', "aria-label": "Search for location" } + %input{ id: 'location-term', type: 'text', name: 'location-term', "aria-label": "#{t('compare.show.add_location')}", value: @view_state.search_term } + %button{ type: 'submit', value: 'search', name: 'form-action', "aria-label": "#{t('action.search')}" } = t('action.search') - if @view_state.search_results From 8d8bb453e740c47d691bd6cb1b5e86333827ea0e Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Wed, 28 Aug 2024 16:34:15 +0100 Subject: [PATCH 077/104] updates label --- app/views/compare/show.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/compare/show.html.haml b/app/views/compare/show.html.haml index 32cf99c9..0cf1ebed 100644 --- a/app/views/compare/show.html.haml +++ b/app/views/compare/show.html.haml @@ -47,10 +47,10 @@ %input{ type: 'hidden', name: 'location[]', value: location.gss } %li.c-compare__add-location - %label{ for: 'location-term'} + %label{ for: 'location-term', id: 'location-term-label'} = t('compare.show.add_location') - %input{ id: 'location-term', type: 'text', name: 'location-term', "aria-label": "#{t('compare.show.add_location')}", value: @view_state.search_term } - %button{ type: 'submit', value: 'search', name: 'form-action', "aria-label": "#{t('action.search')}" } + %input{ id: 'location-term', type: 'text', name: 'location-term', "aria-labelledby": "location-term-label", value: @view_state.search_term } + %button{ type: 'submit', value: 'search', name: 'form-action' } = t('action.search') - if @view_state.search_results From 0f8ecfaf1c06faefdfd083906c5d9a39187dddfc Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Fri, 30 Aug 2024 14:05:14 +0100 Subject: [PATCH 078/104] adds messages to tab panel --- app/assets/stylesheets/_utilities.scss | 2 ++ app/javascript/components/data-view.vue | 18 +++++++++++++++--- config/locales/cy.yml | 2 ++ config/locales/en.yml | 2 ++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/_utilities.scss b/app/assets/stylesheets/_utilities.scss index a3915b3b..5802f216 100644 --- a/app/assets/stylesheets/_utilities.scss +++ b/app/assets/stylesheets/_utilities.scss @@ -10,6 +10,8 @@ overflow: hidden; clip: rect(0 0 0 0); border: 0; + pointer-events: none; + user-select: none; } .u-full-width { diff --git a/app/javascript/components/data-view.vue b/app/javascript/components/data-view.vue index 570e3c15..2327006d 100644 --- a/app/javascript/components/data-view.vue +++ b/app/javascript/components/data-view.vue @@ -1,14 +1,17 @@