diff --git a/.circleci/config.yml b/.circleci/config.yml index 1b7e04dc35..2849dbfeec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -170,6 +170,8 @@ build_and_deploy: &build_and_deploy # Don't check the repo host key export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" + terminus self:plugin:reload + if [[ $CIRCLE_USERNAME = "" ]]; then # Set CIRCLE_USERNAME for builds triggered by GitHub actions echo 'export CIRCLE_USERNAME="BTS eGov"' >> $BASH_ENV && source $BASH_ENV diff --git a/composer.json b/composer.json index aa48185459..827dd012cd 100644 --- a/composer.json +++ b/composer.json @@ -70,7 +70,7 @@ "drupal/crop": "^2.1", "drupal/csv_serialization": "^4.0", "drupal/ctools": "^3.7", - "drupal/custom_add_another": "^2.0", + "drupal/custom_add_another": "^2.1", "drupal/datalayer": "^2.0", "drupal/devel": "^5.1", "drupal/diff": "^1.0", @@ -146,7 +146,7 @@ "drupal/search_api_location": "^1.0@alpha", "drupal/search_api_page": "^1.0", "drupal/search_api_pantheon": "^8.0", - "drupal/search_api_solr": "^4.3.0", + "drupal/search_api_solr": "4.3.3", "drupal/seckit": "^2.0", "drupal/select2": "^1.13", "drupal/sendgrid_integration": "^2.0", @@ -261,6 +261,9 @@ "drupal/bootstrap_datepicker": { "POWR-904/854/1017 - Submodule for exposed filter with custom identifier": "patches/powr-904-bootstrap-datepicker.patch" }, + "drupal/easy_breadcrumb": { + "3421745 - Home page segment not rendered as a link": "https://www.drupal.org/files/issues/2024-06-20/easy_breadcrumb-3421745-8.patch" + }, "drupal/bulk_user_registration": { "POWR-3262 Bulk update existing users": "patches/powr-3262-bulk-update_existing_users.patch" }, @@ -304,6 +307,7 @@ "3020883 - Use VBO together with group permission": "https://www.drupal.org/files/issues/2020-08-17/3020883-22.patch", "3256998 - Access to Revisions of Group Content is Broken": "https://www.drupal.org/files/issues/2022-03-30/group-3256998-35.patch", "3210808 - uasort deprecation in PHP 8": "https://www.drupal.org/files/issues/2021-04-26/uasort-comparison-3210808-2.patch", + "3336280 - avoid fatal error when group argument to GroupAccessResult:: allowedIfHasGroupPermissions() is NULL": "https://www.drupal.org/files/issues/2023-01-24/group-3336280-3.patch", "3212608 - Crashes when using views data export in batch mode": "https://www.drupal.org/files/issues/2022-09-02/3212608-4.patch", "3336280 - avoid fatal error when group argument to GroupAccessResult:: allowedIfHasGroupPermissions() is NULL": "https://www.drupal.org/files/issues/2023-01-24/group-3336280-3.patch", "Change delete user text": "patches/change-delete-user-text.patch" diff --git a/composer.lock b/composer.lock index a3393f8dfe..e2285035c2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0c10e0dde1624d23ffef3693c7fdc005", + "content-hash": "3f09ae320259cd4236665bef28aa096e", "packages": [ { "name": "algolia/places", diff --git a/migrate_group b/migrate_group new file mode 100755 index 0000000000..d3ff8b0a89 --- /dev/null +++ b/migrate_group @@ -0,0 +1,57 @@ +#! /bin/bash + +# Exit on error +set -e +# Turn off warning that the site is in GIT mode +export TERMINUS_HIDE_GIT_MODE_WARNING=1 + +# Skip the custom code to sync group content. See portland_groups.module +terminus drush portlandor.$1 -- state:set portland.skip_group_sync 1 + +# Turn on maintenance mode +terminus drush portlandor.$1 -- state:set system.maintenance_mode 1 --input-format=integer + +# Turn off email notification on Live +if [[ $1 == "live" ]] +then + terminus drush portlandor.$1 -- config:set mailsystem.settings defaults.sender 'test_mail_collector' -y +fi + +# create taxonomy terms +# terminus drush portlandor.$1 -- cr +# terminus drush portlandor.$1 -- cim -y +# terminus drush portlandor.$1 -- portland:create_group_types + +# advisory_group +# terminus drush portlandor.$1 -- portland:list_group_by_type advisory_group > ids_advisory_group.log +for word in $(cat ids_advisory_group.log | grep -v "^$"); do terminus drush portlandor.$1 -- portland:migrate_group $word; done + +# # program +# terminus drush portlandor.$1 -- portland:list_group_by_type program > ids_program.log +# for word in $(cat ids_program.log | grep -v "^$"); do terminus drush portlandor.$1 -- portland:migrate_group $word; done + +# # project +# terminus drush portlandor.$1 -- portland:list_group_by_type project > ids_project.log +# for word in $(cat ids_project.log | grep -v "^$"); do terminus drush portlandor.$1 -- portland:migrate_group $word; done + +# # bureau_office +# terminus drush portlandor.$1 -- portland:list_group_by_type bureau_office > ids_bureau_office.log +# for word in $(cat ids_bureau_office.log | grep -v "^$"); do terminus drush portlandor.$1 -- portland:migrate_group $word; done + +# Delete groups: +# time terminus drush portlandor.group-demo -- portland:delete_groups advisory_group +# time terminus drush portlandor.group-demo -- portland:delete_groups project +# time terminus drush portlandor.group-demo -- portland:delete_groups program +# time terminus drush portlandor.group-demo -- portland:delete_groups bureau_office + +# # re-index +# terminus drush portlandor.$1 -- sapi-r +# terminus drush portlandor.$1 -- sapi-i + +# retore mailer on Live +if [[ $1 == "live" ]] +then + terminus drush portlandor.$1 -- config:set mailsystem.settings defaults.sender 'sendgrid_integration' -y +fi + +# terminus drush portlandor.$1 -- state:delete portland.skip_group_sync diff --git a/private/solr-conf/accents_cy.txt b/private/solr-conf/accents_cy.txt new file mode 100644 index 0000000000..164a152418 --- /dev/null +++ b/private/solr-conf/accents_cy.txt @@ -0,0 +1,185 @@ +# À => A +"\u00C0" => "A" +# Á => A +"\u00C1" => "A" +#  => A +"\u00C2" => "A" +# à => A +"\u00C3" => "A" +# Ä => A +"\u00C4" => "A" +# Å => A +"\u00C5" => "A" +# Ą => A +"\u0104" => "A" +# Æ => AE +"\u00C6" => "AE" +# Ç => C +"\u00C7" => "C" +# Ć => C +"\U0106" => "C" +# È => E +"\u00C8" => "E" +# É => E +"\u00C9" => "E" +# Ê => E +"\u00CA" => "E" +# Ë => E +"\u00CB" => "E" +# Ę => E +"\u0118" => "E" +# Ì => I +"\u00CC" => "I" +# Í => I +"\u00CD" => "I" +# Î => I +"\u00CE" => "I" +# Ï => I +"\u00CF" => "I" +# IJ => IJ +"\u0132" => "IJ" +# Ð => D +"\u00D0" => "D" +# Ł => L +"\u0141" => "L" +# Ñ => N +"\u00D1" => "N" +# Ń => N +"\u0143" => "N" +# Ò => O +"\u00D2" => "O" +# Ó => O +"\u00D3" => "O" +# Ô => O +"\u00D4" => "O" +# Õ => O +"\u00D5" => "O" +# Ö => O +"\u00D6" => "O" +# Ø => O +"\u00D8" => "O" +# Œ => OE +"\u0152" => "OE" +# Þ +"\u00DE" => "TH" +# Ù => U +"\u00D9" => "U" +# Ú => U +"\u00DA" => "U" +# Û => U +"\u00DB" => "U" +# Ü => U +"\u00DC" => "U" +# Ý => Y +"\u00DD" => "Y" +# Ÿ => Y +"\u0178" => "Y" +# à => a +"\u00E0" => "a" +# á => a +"\u00E1" => "a" +# â => a +"\u00E2" => "a" +# ã => a +"\u00E3" => "a" +# ä => a +"\u00E4" => "a" +# å => a +"\u00E5" => "a" +# æ => ae +"\u00E6" => "ae" +# ç => c +"\u00E7" => "c" +# è => e +"\u00E8" => "e" +# é => e +"\u00E9" => "e" +# ê => e +"\u00EA" => "e" +# ë => e +"\u00EB" => "e" +# ì => i +"\u00EC" => "i" +# í => i +"\u00ED" => "i" +# î => i +"\u00EE" => "i" +# ï => i +"\u00EF" => "i" +# ij => ij +"\u0133" => "ij" +# ð => d +"\u00F0" => "d" +# ñ => n +"\u00F1" => "n" +# ò => o +"\u00F2" => "o" +# ó => o +"\u00F3" => "o" +# ô => o +"\u00F4" => "o" +# õ => o +"\u00F5" => "o" +# ö => o +"\u00F6" => "o" +# ø => o +"\u00F8" => "o" +# œ => oe +"\u0153" => "oe" +# ß => ss +"\u00DF" => "ss" +# Ś => S +"\u015a" => "S" +# þ => th +"\u00FE" => "th" +# ù => u +"\u00F9" => "u" +# ú => u +"\u00FA" => "u" +# û => u +"\u00FB" => "u" +# ü => u +"\u00FC" => "u" +# ý => y +"\u00FD" => "y" +# ÿ => y +"\u00FF" => "y" +# Ź => Z +"\u0179" => "Z" +# Ż => Z +"\u017b" => "Z" +# ff => ff +"\uFB00" => "ff" +# fi => fi +"\uFB01" => "fi" +# fl => fl +"\uFB02" => "fl" +# ffi => ffi +"\uFB03" => "ffi" +# ffl => ffl +"\uFB04" => "ffl" +# ſt => st +"\uFB05" => "st" +# st => st +"\uFB06" => "st" +# Māori macrons. +# Ā => A +"\u0100" => "A" +# Ē => E +"\u0112" => "E" +# Ī => I +"\u012A" => "I" +# Ō => O +"\u014C" => "O" +# Ū => U +"\u016A" => "U" +# ā => a +"\u0101" => "a" +# ē => e +"\u0113" => "e" +# ī => i +"\u012B" => "i" +# ō => o +"\u014D" => "o" +# ū => u +"\u016B" => "u" diff --git a/private/solr-conf/nouns_cy.txt b/private/solr-conf/nouns_cy.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/private/solr-conf/nouns_cy.txt @@ -0,0 +1 @@ + diff --git a/private/solr-conf/protwords_cy.txt b/private/solr-conf/protwords_cy.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/private/solr-conf/protwords_cy.txt @@ -0,0 +1 @@ + diff --git a/private/solr-conf/protwords_und.txt b/private/solr-conf/protwords_und.txt index 662e6ed031..e69de29bb2 100644 --- a/private/solr-conf/protwords_und.txt +++ b/private/solr-conf/protwords_und.txt @@ -1,8 +0,0 @@ -#----------------------------------------------------------------------- -# This file blocks words from being operated on by the stemmer and word delimiter. -& -< -> -' -" -parking diff --git a/private/solr-conf/schema.xml b/private/solr-conf/schema.xml index 62067d36d7..eed448c58b 100644 --- a/private/solr-conf/schema.xml +++ b/private/solr-conf/schema.xml @@ -49,7 +49,7 @@ that avoids logging every request --> - + - + - + + + + + - - + + + + + - + + + - - - + - + - - - + + + - + - + - - + + - - + + - + - - - - + - + + + - + - + - + - - + + - + - + - - - - + + + - + + - - + - - + + + - - + - + + + - + + + + - - + - - + + - - + - + + - + + - + + - - + + + - + + - - + + + - + + + + - + + - - + + - + + - - + + - + + - - + + - - + + + + - + - - + + + - + + + - - + + + + + + + + - - + + + + + + + - + - - - - - - + + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + - + - - - - - + + + + + + + + - - - - - + + + + - + + - + + + - - + + + - + + + + - - + + - - + + + + + - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + - + + + - - + + + - + + - - + + + - + - + - - + - + + - + - - - - + + + + - - - + + + + + - + + + + + + + + + + + + - - - + - + + + + + - - + + + + + + - + + + - + - - - - + + - - + - + + + @@ -491,10 +1859,9 @@ - - + @@ -502,9 +1869,9 @@ - + - + @@ -522,7 +1889,6 @@ - @@ -532,7 +1898,7 @@ - + @@ -548,16 +1914,16 @@ - + - + - + @@ -583,11 +1949,70 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - explicit - id - - - elevator - - -