Reorganise admin navigation and add requirements

Gemfile.lock

@@ -29,8 +29,8 @@ PATH
   remote: engines/bops_core
   specs:
     bops_core (0.1.0)
-      govuk-components (~> 5, >= 5.3.2)
-      govuk_design_system_formbuilder (~> 5, >= 5.3.2)
+      govuk-components (~> 5, >= 5.8.0)
+      govuk_design_system_formbuilder (~> 5, >= 5.8.0)
       pagy
       rails (~> 7.2)
 
@@ -149,14 +149,14 @@ GEM
     base64 (0.2.0)
     bcrypt (3.1.20)
     benchmark (0.4.0)
-    better_html (2.0.1)
+    better_html (2.1.1)
       actionview (>= 6.0)
       activesupport (>= 6.0)
       ast (~> 2.0)
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
     bindex (0.8.1)
     bootsnap (1.18.3)
       msgpack (~> 1.2)
@@ -181,8 +181,8 @@ GEM
       xpath (~> 3.2)
     coderay (1.1.3)
     commonmarker (0.23.10)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -256,7 +256,7 @@ GEM
       rainbow
       rubocop
       smart_properties
-    erubi (1.13.0)
+    erubi (1.13.1)
     et-orbi (1.2.11)
       tzinfo
     factory_bot (6.4.6)
@@ -281,11 +281,11 @@ GEM
       raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    govuk-components (5.3.2)
+    govuk-components (5.8.0)
       html-attributes-utils (~> 1.0.0, >= 1.0.0)
-      pagy (>= 6, < 8)
-      view_component (>= 3.9, < 3.12)
-    govuk_design_system_formbuilder (5.3.3)
+      pagy (>= 6, < 10)
+      view_component (>= 3.18, < 3.22)
+    govuk_design_system_formbuilder (5.8.0)
       actionview (>= 6.1)
       activemodel (>= 6.1)
       activesupport (>= 6.1)
@@ -311,29 +311,30 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     hana (1.3.7)
     hashdiff (1.1.0)
-    highline (2.0.3)
+    highline (3.1.2)
+      reline
     holidays (8.8.0)
     html-attributes-utils (1.0.2)
       activesupport (>= 6.1.4.4)
     htmlentities (4.3.4)
     i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.12)
+    i18n-tasks (1.0.14)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
-      better_html (>= 1.0, < 3.0)
       erubi
       highline (>= 2.0.0)
       i18n
-      parser (>= 2.2.3.0)
+      parser (>= 3.2.2.1)
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    io-console (0.7.2)
-    irb (1.14.1)
+    io-console (0.8.0)
+    irb (1.15.1)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jbuilder (2.13.0)
@@ -358,13 +359,13 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.3)
+    logger (1.6.5)
     lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.23.1)
+    loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     lumberjack (1.2.10)
@@ -402,14 +403,14 @@ GEM
     net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.18.1)
+    nokogiri (1.18.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.1-arm64-darwin)
+    nokogiri (1.18.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.1-x86_64-darwin)
+    nokogiri (1.18.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.1-x86_64-linux-gnu)
+    nokogiri (1.18.2-x86_64-linux-gnu)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -420,33 +421,37 @@ GEM
       commonmarker (~> 0.17)
     orm_adapter (0.5.0)
     ostruct (0.6.0)
-    pagy (7.0.11)
+    pagy (9.3.3)
     parallel (1.25.1)
-    parser (3.3.6.0)
+    parser (3.3.7.0)
       ast (~> 2.4.1)
       racc
     pg (1.4.5)
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    psych (5.1.2)
+    psych (5.2.3)
+      date
       stringio
     public_suffix (5.0.4)
     puma (6.4.3)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.1.8)
-    rack-session (2.0.0)
+    rack (3.1.9)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
       rack (>= 3.0.0)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (2.1.0)
+    rackup (2.2.1)
       rack (>= 3)
-      webrick (~> 1.8)
     rails (7.2.2.1)
       actioncable (= 7.2.2.1)
       actionmailbox (= 7.2.2.1)
@@ -469,10 +474,10 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.1)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       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)
-    rails-i18n (7.0.6)
+    rails-i18n (7.0.10)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_autolink (1.1.7)
@@ -490,12 +495,12 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.7.0)
+    rdoc (6.11.0)
       psych (>= 4.0.0)
     redis-client (0.22.1)
       connection_pool
     regexp_parser (2.9.2)
-    reline (0.5.10)
+    reline (0.6.0)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
@@ -612,25 +617,25 @@ GEM
       railties (>= 6.0.0)
     store_model (4.2.0)
       activerecord (>= 7.0)
-    stringio (3.1.1)
+    stringio (3.1.2)
     strong_migrations (1.8.0)
       activerecord (>= 5.2)
     strong_password (0.0.10)
     sys-uname (1.3.1)
       ffi (~> 1.1)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
     thor (1.3.2)
     tilt (2.1.0)
     timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     uniform_notifier (1.16.0)
     uri (0.13.0)
     useragent (0.16.11)
-    view_component (3.11.0)
-      activesupport (>= 5.2.0, < 8.0)
+    view_component (3.21.0)
+      activesupport (>= 5.2.0, < 8.1)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
     warden (1.2.9)
@@ -644,7 +649,6 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.8.2)
     websocket (1.2.10)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)

app/assets/stylesheets/_main.scss

@@ -2,16 +2,22 @@ $govuk-assets-path: "govuk-frontend/dist/govuk/assets/";
 $govuk-font-family: open-sans, sans-serif;
 $govuk-page-width: 1100px;
 
+// Imports from node_modules
 @import "govuk-frontend/dist/govuk/all";
 @import "accessible-autocomplete/dist/accessible-autocomplete.min";
+@import "@x-govuk/govuk-prototype-components/x-govuk/components/secondary-navigation/secondary-navigation";
+@import "@x-govuk/govuk-prototype-components/x-govuk/components/sub-navigation/sub-navigation";
+
+// Imports from engines
+@import "bops_core/components/side_navigation";
 @import "bops_core/components/task_accordion";
+
+// Imports from the application
 @import "components/buttons";
 @import "components/documents";
 @import "components/flashes";
 @import "components/inset_text";
 @import "components/loading_spinner";
-@import "components/primary_navigation";
-@import "components/secondary_navigation";
 @import "components/sortable";
 @import "components/status_panel";
 @import "components/summary_list";
@@ -434,6 +440,10 @@ body {
   text-wrap: balance;
 }
 
+.govuk-\!-text-wrap-nowrap {
+  white-space: nowrap;
+}
+
 .comment-component {
   border-left: 10px solid $govuk-link-colour;
   background-color: #F2F9FF;