Merge pull request #1195 from dof-dss/D8UN-uat

Release v0.27.1

.circleci/config.yml

@@ -165,6 +165,9 @@ jobs:
                 npm install
                 npm rebuild node-sass
                 npm run build
+
+                git add *.css
+                git commit -m "Theme rebuild"
               else
                 echo "No theme folder detected under ~/project/web/sites/${site}/themes/${site}_theme, skipping."
               fi

.gitignore

@@ -11,6 +11,7 @@
 /web/modules/origins
 console/
 imports
+node_modules/
 
 # Ignore migrate Yaml files in the config directory, as they should
 # now live inside custom modules e.g. web/sites/uregni/modules/custom_migrations

.lando.yml

@@ -16,6 +16,8 @@ proxy:
     - nipolicingboard.org.uk.lndo.site
     - pbni.org.uk.lndo.site
     - investnireview.org.uk.lndo.site
+    - pcsps.org.lndo.site
+    - cscsreviewni.net.lndo.site
 services:
   uregni_solr:
     type: solr:7
@@ -41,3 +43,15 @@ services:
     core: default
     config:
       dir: .lando/config/solr/7.x/default
+  pcsps_solr:
+    type: solr:7
+    portforward: true
+    core: default
+    config:
+      dir: .lando/config/solr/7.x/default
+  attorneygeneralni_solr:
+    type: solr:7
+    portforward: true
+    core: default
+    config:
+      dir: .lando/config/solr/7.x/default

.platform.app.yaml

@@ -32,6 +32,7 @@ relationships:
   liofa: 'db:liofa'
   odscni: 'db:odscni'
   attorneygeneralni: 'db:attorneygeneralni'
+  attorneygeneralni_solr: 'solr:attorneygeneralni'
   employmenttribunalsni: 'db:employmenttribunalsni'
   fiscalcommissionni: 'db:fiscalcommissionni'
   nifiscalcouncil: 'db:nifiscalcouncil'
@@ -46,6 +47,9 @@ relationships:
   pbni: 'db:pbni'
   pbni_solr: 'solr:pbni'
   investnireview: 'db:investnireview'
+  pcsps: 'db:pcsps'
+  pcsps_solr: 'solr:pcsps'
+  cscsreviewni: 'db:cscsreviewni'
 
 # The size of the persistent disk of the application (in MB).
 disk: 30720
@@ -92,7 +96,7 @@ hooks:
     export FASTLY_API_SERVICE=dummyservice
 
     # For each multi site - run db-updates and import config.
-    for site in uregni odscni fiscalcommissionni urologyservicesinquiry mahinquiry niauditoffice nifiscalcouncil octf employmenttribunalsni independentreviewofeducation nipolicingboard investnireview
+    for site in uregni odscni fiscalcommissionni urologyservicesinquiry mahinquiry niauditoffice nifiscalcouncil octf employmenttribunalsni independentreviewofeducation nipolicingboard investnireview pbni
     do
       echo "****** $site deployment ******"
       cd /app/web/sites/$site
@@ -220,3 +224,6 @@ crons:
   investnireview:
     spec: '10 * * * *'
     cmd: 'cd web/sites/investnireview ; drush core-cron'
+  cscsreviewni:
+    spec: '10 * * * *'
+    cmd: 'cd web/sites/cscsreviewni ; drush core-cron'

.platform/routes.yaml

@@ -239,6 +239,38 @@
 
 #---------------------------------
 
+"https://www.pcsps.org/":
+  type: upstream
+  upstream: "unity:http"
+  cache:
+    enabled: false
+
+"https://pcsps.org.{default}/":
+  type: redirect
+  to: "https://www.pcsps.org.{default}/"
+
+"https://pcsps.org/":
+  type: redirect
+  to: "https://www.pcsps.org/"
+
+#---------------------------------
+
+"https://www.cscsreviewni.net/":
+  type: upstream
+  upstream: "unity:http"
+  cache:
+    enabled: false
+
+"https://cscsreviewni.net.{default}/":
+  type: redirect
+  to: "https://www.cscsreviewni.net.{default}/"
+
+"https://cscsreviewni.net/":
+  type: redirect
+  to: "https://www.cscsreviewni.net/"
+
+#---------------------------------
+
 # Catch all.
 "https://www.{all}/":
   type: upstream

.platform/services.yaml

@@ -25,6 +25,8 @@ db:
       - nipolicingboarddb
       - pbnidb
       - investnireviewdb
+      - pcspsdb
+      - cscsreviewnidb
     endpoints:
       uregni:
         default_schema: uregnidb
@@ -86,6 +88,14 @@ db:
         default_schema: investnireviewdb
         privileges:
           investnireviewdb: admin
+      pcsps:
+        default_schema: pcspsdb
+        privileges:
+          pcspsdb: admin
+      cscsreviewni:
+        default_schema: cscsreviewnidb
+        privileges:
+          cscsreviewnidb: admin
 
 # Fudging the service name forces a full rebuild with any new config.
 solr:
@@ -101,6 +111,10 @@ solr:
         conf_dir: !archive "solr_config/"
       pbni_index:
         conf_dir: !archive "solr_config/"
+      pcsps_index:
+        conf_dir: !archive "solr_config/"
+      attorneygeneralni_index:
+        conf_dir: !archive "solr_config/"
       #     fictcommission_index:
       #       conf_dir: !archive "solr_config/"
     endpoints:
@@ -112,6 +126,10 @@ solr:
         core: nipolicingboard_index
       pbni:
         core: pbni_index
+      pcsps:
+        core: pcsps_index
+      attorneygeneralni:
+        core: attorneygeneralni_index
 #     fictcommission:
 #       core: fictcommission_index
 

composer.json

@@ -65,7 +65,7 @@
         "dinbror/blazy": "^1.8",
         "dof-dss/nicsdru_origins_modules": "^1.1",
         "dof-dss/nicsdru_origins_profile": "0.1.11",
-        "dof-dss/nicsdru_unity_theme": "^0.1.48",
+        "dof-dss/nicsdru_unity_theme": "^0.1.49",
         "drupal/address": "^1.7",
         "drupal/admin_toolbar": "^2.0",
         "drupal/adminimal_theme": "^1.5",

config/attorneygeneralni/config/.htaccess

@@ -19,6 +19,9 @@ SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
 </Files>
 
 # If we know how to do it safely, disable the PHP engine entirely.
+<IfModule mod_php5.c>
+  php_flag engine off
+</IfModule>
 <IfModule mod_php7.c>
   php_flag engine off
 </IfModule>

config/attorneygeneralni/config/block.block.adminimal_theme_breadcrumbs.yml

@@ -1,4 +1,4 @@
-uuid: c6ab317a-d39d-4a55-9599-25910863fc41
+uuid: e09f2a73-924a-4bd9-9f15-ce0334e5a60f
 langcode: en
 status: true
 dependencies:

config/attorneygeneralni/config/block.block.adminimal_theme_content.yml

@@ -1,4 +1,4 @@
-uuid: b599fee3-7e98-43c7-9491-292f1bac20f7
+uuid: 410ef828-3035-4fff-aed2-62e2ae366b37
 langcode: en
 status: true
 dependencies:

config/attorneygeneralni/config/block.block.adminimal_theme_help.yml

@@ -1,4 +1,4 @@
-uuid: 7ad72769-a650-4816-a474-4f8df06b8ea0
+uuid: 22ab5ceb-c5a5-44bb-89eb-05176580fd37
 langcode: en
 status: true
 dependencies:

config/attorneygeneralni/config/block.block.adminimal_theme_local_actions.yml

@@ -1,4 +1,4 @@
-uuid: 8ad70c1c-58a1-4939-ab7c-0add2504afd5
+uuid: fe8ec53f-5840-401a-9ae9-ccbd0d31618d
 langcode: en
 status: true
 dependencies:

config/attorneygeneralni/config/block.block.adminimal_theme_login.yml

@@ -1,4 +1,4 @@
-uuid: 1b039273-6028-480d-a09d-2811c9ac0e2e
+uuid: 4e2f97f5-9ffa-4d65-9a5e-115007f42e3c
 langcode: en
 status: true
 dependencies:

config/attorneygeneralni/config/block.block.adminimal_theme_messages.yml

@@ -1,4 +1,4 @@
-uuid: 7b2bc613-da2d-4316-97df-83c96a28d005
+uuid: ec95d65a-e2c9-48e7-9b4c-c2a6d25be9ad
 langcode: en
 status: true
 dependencies:

config/attorneygeneralni/config/block.block.adminimal_theme_page_title.yml

@@ -1,4 +1,4 @@
-uuid: dafc51a3-dcde-4da1-ab9e-c76b224d3b88
+uuid: 8b6520c0-dbd1-45bc-82c8-4b6002ca78d2
 langcode: en
 status: true
 dependencies:

config/attorneygeneralni/config/block.block.adminimal_theme_primary_local_tasks.yml

@@ -1,4 +1,4 @@
-uuid: 83327424-a64d-4dbd-9a07-c037e9792301
+uuid: b03fbdd7-4430-4633-bfef-5eb1a1141445
 langcode: en
 status: true
 dependencies:

config/attorneygeneralni/config/block.block.adminimal_theme_secondary_local_tasks.yml

@@ -1,4 +1,4 @@
-uuid: 7df6c78c-39bf-4512-af3e-5253c20fb8cd
+uuid: e443a5c1-ebd1-4ef0-b936-f5c510003724
 langcode: en
 status: true
 dependencies:

config/attorneygeneralni/config/block.block.footerlinks.yml

@@ -0,0 +1,25 @@
+uuid: 523387ff-e438-4890-b431-23f5b2fa7c7f
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.menu-footer-links
+  module:
+    - system
+  theme:
+    - attorneygeneralni_theme
+id: footerlinks
+theme: attorneygeneralni_theme
+region: footer
+weight: 0
+provider: null
+plugin: 'system_menu_block:menu-footer-links'
+settings:
+  id: 'system_menu_block:menu-footer-links'
+  label: 'Footer links'
+  provider: system
+  label_display: '0'
+  level: 1
+  depth: 0
+  expand_all_items: false
+visibility: {  }

config/attorneygeneralni/config/block.block.homepageattorneygeneralprofile.yml

@@ -0,0 +1,30 @@
+uuid: 2961865c-e8d5-4d4e-9638-d33ab51b6c65
+langcode: en
+status: true
+dependencies:
+  content:
+    - 'block_content:basic_block:be7d98a4-718a-4831-b9fb-158b904898ee'
+  module:
+    - block_content
+    - system
+  theme:
+    - attorneygeneralni_theme
+id: homepageattorneygeneralprofile
+theme: attorneygeneralni_theme
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'block_content:be7d98a4-718a-4831-b9fb-158b904898ee'
+settings:
+  id: 'block_content:be7d98a4-718a-4831-b9fb-158b904898ee'
+  label: 'Homepage Attorney General profile'
+  provider: block_content
+  label_display: '0'
+  status: true
+  info: ''
+  view_mode: full
+visibility:
+  request_path:
+    id: request_path
+    pages: '<front>'
+    negate: false

config/attorneygeneralni/config/block.block.mainmenu.yml

@@ -0,0 +1,25 @@
+uuid: 529ecfdd-01f1-444d-8a80-2776bb585a08
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.main
+  module:
+    - system
+  theme:
+    - attorneygeneralni_theme
+id: mainmenu
+theme: attorneygeneralni_theme
+region: primary_menu
+weight: 0
+provider: null
+plugin: 'system_menu_block:main'
+settings:
+  id: 'system_menu_block:main'
+  label: 'Main menu'
+  provider: system
+  label_display: '0'
+  level: 1
+  depth: 2
+  expand_all_items: true
+visibility: {  }