Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby file: '.ruby-version'

gem "rails", "8.1.3"
gem "rails", "8.1.3.1"
gem 'bundler-audit'
gem 'cgi'
gem 'fiddle'
Expand Down
139 changes: 70 additions & 69 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,66 +12,66 @@ GEM
specs:
action_text-trix (2.1.19)
railties
actioncable (8.1.3)
actionpack (= 8.1.3)
activesupport (= 8.1.3)
actioncable (8.1.3.1)
actionpack (= 8.1.3.1)
activesupport (= 8.1.3.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (8.1.3)
actionpack (= 8.1.3)
activejob (= 8.1.3)
activerecord (= 8.1.3)
activestorage (= 8.1.3)
activesupport (= 8.1.3)
actionmailbox (8.1.3.1)
actionpack (= 8.1.3.1)
activejob (= 8.1.3.1)
activerecord (= 8.1.3.1)
activestorage (= 8.1.3.1)
activesupport (= 8.1.3.1)
mail (>= 2.8.0)
actionmailer (8.1.3)
actionpack (= 8.1.3)
actionview (= 8.1.3)
activejob (= 8.1.3)
activesupport (= 8.1.3)
actionmailer (8.1.3.1)
actionpack (= 8.1.3.1)
actionview (= 8.1.3.1)
activejob (= 8.1.3.1)
activesupport (= 8.1.3.1)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (8.1.3)
actionview (= 8.1.3)
activesupport (= 8.1.3)
actionpack (8.1.3.1)
actionview (= 8.1.3.1)
activesupport (= 8.1.3.1)
nokogiri (>= 1.8.5)
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
useragent (~> 0.16)
actiontext (8.1.3)
actiontext (8.1.3.1)
action_text-trix (~> 2.1.15)
actionpack (= 8.1.3)
activerecord (= 8.1.3)
activestorage (= 8.1.3)
activesupport (= 8.1.3)
actionpack (= 8.1.3.1)
activerecord (= 8.1.3.1)
activestorage (= 8.1.3.1)
activesupport (= 8.1.3.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (8.1.3)
activesupport (= 8.1.3)
actionview (8.1.3.1)
activesupport (= 8.1.3.1)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (8.1.3)
activesupport (= 8.1.3)
activejob (8.1.3.1)
activesupport (= 8.1.3.1)
globalid (>= 0.3.6)
activemodel (8.1.3)
activesupport (= 8.1.3)
activerecord (8.1.3)
activemodel (= 8.1.3)
activesupport (= 8.1.3)
activemodel (8.1.3.1)
activesupport (= 8.1.3.1)
activerecord (8.1.3.1)
activemodel (= 8.1.3.1)
activesupport (= 8.1.3.1)
timeout (>= 0.4.0)
activestorage (8.1.3)
actionpack (= 8.1.3)
activejob (= 8.1.3)
activerecord (= 8.1.3)
activesupport (= 8.1.3)
activestorage (8.1.3.1)
actionpack (= 8.1.3.1)
activejob (= 8.1.3.1)
activerecord (= 8.1.3.1)
activesupport (= 8.1.3.1)
marcel (~> 1.0)
activesupport (8.1.3)
activesupport (8.1.3.1)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
Expand Down Expand Up @@ -113,14 +113,14 @@ GEM
activesupport (>= 7.2.0, < 8.2.0)
railties (>= 7.2.0, < 8.2.0)
zeitwerk (>= 2.5.0)
concurrent-ruby (1.3.7)
concurrent-ruby (1.3.8)
connection_pool (3.0.2)
crass (1.0.7)
date (3.5.1)
diff-lcs (1.6.2)
docile (1.4.1)
drb (2.2.3)
erb (6.0.4)
erb (6.0.7)
erubi (1.13.1)
factory_bot (6.5.1)
activesupport (>= 6.1.0)
Expand All @@ -130,13 +130,13 @@ GEM
faker (3.5.1)
i18n (>= 1.8.11, < 2)
fiddle (1.1.8)
globalid (1.3.0)
globalid (1.4.0)
activesupport (>= 6.1)
haml (6.3.0)
temple (>= 0.8.2)
thor
tilt
i18n (1.14.8)
i18n (1.15.2)
concurrent-ruby (~> 1.0)
importmap-rails (2.1.0)
actionpack (>= 6.0.0)
Expand All @@ -151,12 +151,12 @@ GEM
jbuilder (2.13.0)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
json (2.19.9)
json (2.21.2)
logger (1.7.0)
loofah (2.25.2)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.9.0)
mail (2.9.1)
logger
mini_mime (>= 0.1.1)
net-imap
Expand All @@ -169,7 +169,7 @@ GEM
drb (~> 2.0)
prism (~> 1.5)
msgpack (1.8.3)
net-imap (0.6.4.1)
net-imap (0.6.6)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -189,17 +189,14 @@ GEM
rake (>= 12.3.3)
pg (1.6.3-arm64-darwin)
pg (1.6.3-x86_64-linux)
pp (0.6.3)
pp (0.6.4)
prettyprint
prettyprint (0.2.0)
prism (1.9.0)
propshaft (1.3.1)
actionpack (>= 7.0.0)
activesupport (>= 7.0.0)
rack
psych (5.4.0)
date
stringio
public_suffix (7.0.5)
racc (1.8.1)
rack (3.2.6)
Expand All @@ -215,20 +212,20 @@ GEM
rack (>= 1.3)
rackup (2.3.1)
rack (>= 3)
rails (8.1.3)
actioncable (= 8.1.3)
actionmailbox (= 8.1.3)
actionmailer (= 8.1.3)
actionpack (= 8.1.3)
actiontext (= 8.1.3)
actionview (= 8.1.3)
activejob (= 8.1.3)
activemodel (= 8.1.3)
activerecord (= 8.1.3)
activestorage (= 8.1.3)
activesupport (= 8.1.3)
rails (8.1.3.1)
actioncable (= 8.1.3.1)
actionmailbox (= 8.1.3.1)
actionmailer (= 8.1.3.1)
actionpack (= 8.1.3.1)
actiontext (= 8.1.3.1)
actionview (= 8.1.3.1)
activejob (= 8.1.3.1)
activemodel (= 8.1.3.1)
activerecord (= 8.1.3.1)
activestorage (= 8.1.3.1)
activesupport (= 8.1.3.1)
bundler (>= 1.15.0)
railties (= 8.1.3)
railties (= 8.1.3.1)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -240,19 +237,24 @@ GEM
rails-html-sanitizer (1.7.1)
loofah (~> 2.25, >= 2.25.2)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
railties (8.1.3)
actionpack (= 8.1.3)
activesupport (= 8.1.3)
railties (8.1.3.1)
actionpack (= 8.1.3.1)
activesupport (= 8.1.3.1)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
tsort (>= 0.2)
zeitwerk (~> 2.6)
rake (13.4.2)
rdoc (7.2.0)
rbs (4.1.2)
logger
prism (>= 1.6.0)
tsort
rdoc (8.0.0)
erb
psych (>= 4.0.0)
prism (>= 1.6.0)
rbs (>= 4.0.0)
tsort
regexp_parser (2.10.0)
reline (0.6.3)
Expand Down Expand Up @@ -291,7 +293,6 @@ GEM
simplecov_json_formatter (0.1.4)
stimulus-rails (1.3.4)
railties (>= 6.0.0)
stringio (3.2.0)
temple (0.10.3)
thor (1.5.0)
tilt (2.6.0)
Expand All @@ -316,7 +317,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.8.2)
zeitwerk (2.8.3)

PLATFORMS
arm64-darwin-24
Expand All @@ -341,7 +342,7 @@ DEPENDENCIES
pg
propshaft
rack-attack
rails (= 8.1.3)
rails (= 8.1.3.1)
rails-controller-testing
rspec-rails
selenium-webdriver
Expand Down
8 changes: 7 additions & 1 deletion app/models/content_type_object.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ def initialize(content_type_object_data)
end

##
# takes object data as an argument and returns an instance of the correct object subclass
# Class method to evaluate the Solr object data, assign an object class
# Returns an instance of the object class
def self.generate(content_type_object_data)
# return nil if there's no data
return unless content_type_object_data
Expand Down Expand Up @@ -463,6 +464,11 @@ def get_all_from(field_name)
content_type_object_data[field_name].map { |value| { value: value, field_name: field_name } }
end

##
# Class method to determine the class name that should be associated with a given combination of type and subtype
# IDs.
# Subtype is only evaluated in specific cases, where we have defined a distinct object type for that subtype. In
# all other cases, the object type assigned will be based on the type_id.
def self.content_type_object_class(type_id, subtype_ids)
case type_id
when 90996
Expand Down
15 changes: 14 additions & 1 deletion app/views/meta/roadmap.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,16 @@
<%= render 'meta/meta_sidebar' %>
<div class="reading-width">
<p>
We are currently focussed on improving how Parliamentary Search handles queries.
We are currently focussed on making improvements to results pages and creating targeted search queries. These are
known as aliases. For example, the <b>subject</b> alias is used to search by subject:
</p>

<p>
<%= link_to('subject:horses', 'https://beta-search.parliament.uk/search?query=subject%3Ahorses') %>
</p>

<p>
<%= link_to('subject:"Walsall Leather Museum"', 'https://beta-search.parliament.uk/search?query=subject%3A%22Walsall+Leather+Museum%22') %>
</p>

<p>
Expand All @@ -26,4 +35,8 @@
The <%= link_to("website code can be found on GitHub", "https://github.com/ukparliament/search-prototype") %>. Pull
requests are welcome.
</p>

<em>
Last updated: August 2027
</em>
</div>
Loading