Merge pull request #1082 from dof-dss/uat

release to production Drupal 10 upgrade

Author: David-Corbett

.circleci/config.yml

@@ -56,9 +56,8 @@ commands:
       - run:
           name: Switch dof-dss packages to HEAD on develelopment branch
           command: |
-            composer require dof-dss/nidirect-site-modules:dev-development \
-              dof-dss/nidirect-d8-test-install-profile:dev-development dof-dss/nicsdru_origins_theme:dev-development \
-                dof-dss/nicsdru_origins_modules:dev-development dof-dss/nicsdru_nidirect_theme:dev-development
+            composer require dof-dss/nicsdru_origins_theme:dev-10.x-dev \
+                             dof-dss/nicsdru_origins_modules:dev-10.x-dev
   hosts_keyscan:
     description: "Keyscan for hosts that require SSH access"
     steps:

.env.example

@@ -4,9 +4,9 @@
 # SAFE ENV VARS, RELEVANT FOR LOCAL DEVELOPMENT.
 CONFIG_READONLY=0
 DB_HOST=database
-DB_USER=drupal9
-DB_PASS=drupal9
-DB_NAME=drupal9
+DB_USER=drupal10
+DB_PASS=drupal10
+DB_NAME=drupal10
 DB_PREFIX=
 DB_PORT=3306
 DB_NAMESPACE=Drupal\Core\Database\Driver\mysql

.gitignore

@@ -3,11 +3,13 @@
 /vendor/
 /web/core/
 /web/modules/contrib/
-/web/modules/custom/
 /web/modules/migrate/
 /web/modules/origins/
 /web/themes/contrib/
-/web/themes/custom/
+!/web/themes/custom/
+/web/themes/custom/*
+!/web/themes/custom/nicsdru_nidirect_theme
+!/web/themes/custom/nicsdru_nidirect_theme/**/*
 /web/profiles/contrib/
 /web/profiles/custom/
 /web/libraries/

.lando.yml

@@ -1,13 +1,13 @@
 # Override any general project config via a .lando.local.yml file
 # See https://docs.lando.dev/core/v3/#override-file for details.
 name: nidirect
-recipe: drupal9
+recipe: drupal10
 env_file:
   - .env
 config:
   webroot: web
   php: '8.1'
-  composer_version: '2.0.7'
+  composer_version: '2.5.8'
   via: apache:2.4
   database: mariadb:10.5
   # https://docs.lando.dev/config/drupal9.html#using-drush
@@ -26,6 +26,8 @@ services:
     scanner: false
     build_as_root:
       - /app/.lando/scripts/appserver_build.sh
+      - curl -sL https://deb.nodesource.com/setup_14.x | bash -
+      - apt-get install -y nodejs
     overrides:
       environment:
         # Support debugging CLI with XDEBUG.
@@ -51,6 +53,8 @@ services:
     hogfrom:
       - appserver
 tooling:
+  node:
+    service: appserver
   xdebug-on:
     service: appserver
     description: Enable xdebug

.lando/config/solr/7.x/default/accents_en.txt

@@ -161,4 +161,4 @@
 # ſt => st
 "\uFB05" => "st"
 # st => st
-"\uFB06" => "st"
+"\uFB06" => "st"

.lando/config/solr/7.x/default/accents_und.txt

@@ -145,4 +145,4 @@
 # ſt => st
 "\uFB05" => "st"
 # st => st
-"\uFB06" => "st"
+"\uFB06" => "st"

.lando/config/solr/7.x/default/protwords_en.txt

@@ -1,7 +0,0 @@
-#-----------------------------------------------------------------------
-# This file blocks words from being operated on by the stemmer and word delimiter.
-&
-<
->
-'
-"

.lando/config/solr/7.x/default/protwords_und.txt

@@ -1,7 +0,0 @@
-#-----------------------------------------------------------------------
-# This file blocks words from being operated on by the stemmer and word delimiter.
-&
-<
->
-'
-"

.lando/config/solr/7.x/default/schema.xml

@@ -49,7 +49,7 @@
     that avoids logging every request
 -->
 
-<schema name="drupal-4.1.0-solr-7.x-0" version="1.6">
+<schema name="drupal-4.3.0-solr-7.x-0" version="1.6">
   <!-- attribute "name" is the name of this schema and is only used for display purposes.
        version="x.y" is Solr's version number for the schema syntax and
        semantics.  It should not normally be changed by applications.
@@ -154,14 +154,9 @@
   <field name="boost_document" type="pfloat" indexed="true" stored="false" multiValued="false" docValues="true"/>
   <field name="boost_term" type="boost_term_payload" indexed="true" stored="false" multiValued="true"/>
 
-  <!-- This field is used to build the spellchecker index -->
-  <field name="spell" type="text_spell_und" indexed="true" stored="true" multiValued="true"/>
-
-  <!-- copyField commands copy one field to another at the time a document
-       is added to the index.  It's used either to index the same field differently,
-       or to add multiple fields to the same field for easier/faster searching.  -->
-  <copyField source="ts_*" dest="spell"/>
-  <copyField source="tm_*" dest="spell"/>
+  <!-- Currently the suggester context filter query (suggest.cfq) accesses the tags using the stored values, neither the indexed terms nor the docValues.
+       Therefore the dynamicField sm_* isn't suitable at the moment -->
+  <field name="sm_context_tags" type="string" indexed="true" stored="true" multiValued="true" docValues="false"/>
 
   <!-- Dynamic field definitions.  If a field name is not found, dynamicFields
        will be used if the name matches any of the patterns.
@@ -196,12 +191,12 @@
   <dynamicField name="tws_*" type="text_ws" indexed="true" stored="true" multiValued="false"/>
   <dynamicField name="twm_*" type="text_ws" indexed="true" stored="true" multiValued="true"/>
 
-  <!-- Trie fields are deprecated. Point fields solve all needs. But we keep the dedicated field names for backward compatibility. -->
   <dynamicField name="ds_*"  type="pdate"   indexed="true"  stored="false" multiValued="false" docValues="true"/>
   <dynamicField name="dm_*"  type="pdate"   indexed="true"  stored="false" multiValued="true" docValues="true"/>
   <!-- This field is used to store date ranges -->
   <dynamicField name="drs_*" type="date_range" indexed="true" stored="true" multiValued="false"/>
   <dynamicField name="drm_*" type="date_range" indexed="true" stored="true" multiValued="true"/>
+  <!-- Trie fields are deprecated. Point fields solve all needs. But we keep the dedicated field names for backward compatibility. -->
   <dynamicField name="its_*" type="plong"   indexed="true"  stored="false" multiValued="false" docValues="true" termVectors="true"/>
   <dynamicField name="itm_*" type="plong"   indexed="true"  stored="false" multiValued="true" docValues="true" termVectors="true"/>
   <dynamicField name="fts_*" type="pfloat"  indexed="true"  stored="false" multiValued="false" docValues="true"/>
@@ -384,6 +379,7 @@
     <fieldType name="boost_term_payload" stored="false" indexed="true" class="solr.TextField" >
       <analyzer>
         <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.LengthFilterFactory" min="2" max="100"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
         <!--
@@ -398,7 +394,6 @@
              Fully Qualified class name implementing PayloadEncoder, Encoder must have a no arg constructor.
          -->
         <filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="float"/>
-        <filter class="solr.LengthFilterFactory" min="2" max="100"/>
       </analyzer>
     </fieldType>
 

.lando/config/solr/7.x/default/schema_extra_fields.xml

@@ -28,7 +28,7 @@
 <dynamicField name="tom_X3b_en_*" type="text_en" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
 <dynamicField name="tus_X3b_en_*" type="text_unstemmed_en" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
 <dynamicField name="tum_X3b_en_*" type="text_unstemmed_en" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
-<dynamicField name="sort_X3b_en_*" type="collated_en" stored="false" indexed="false" docValues="true" />
+<dynamicField name="sort_X3b_en_*" type="collated_en" stored="false" indexed="false" docValues="true" useDocValuesAsStored="false" />
 <dynamicField name="tcphonetics_X3b_und_*" type="text_phonetic_und" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
 <dynamicField name="tcphonetics_*" type="text_phonetic_und" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
 <dynamicField name="tcphoneticm_X3b_und_*" type="text_phonetic_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
@@ -47,6 +47,18 @@
 <dynamicField name="tocphoneticm_X3b_en_*" type="text_phonetic_en" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
 <dynamicField name="tucphonetics_X3b_en_*" type="text_phonetic_en" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
 <dynamicField name="tucphoneticm_X3b_en_*" type="text_phonetic_en" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tcstrings_X3b_und_*" type="text_string" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tcstrings_*" type="text_string" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tcstringm_X3b_und_*" type="text_string" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tcstringm_*" type="text_string" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tocstrings_X3b_und_*" type="text_string" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="true" />
+<dynamicField name="tocstrings_*" type="text_string" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="true" />
+<dynamicField name="tocstringm_X3b_und_*" type="text_string" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
+<dynamicField name="tocstringm_*" type="text_string" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
+<dynamicField name="tucstrings_X3b_und_*" type="text_string" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tucstrings_*" type="text_string" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tucstringm_X3b_und_*" type="text_string" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tucstringm_*" type="text_string" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
 <dynamicField name="ts_X3b_und_*" type="text_und" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
 <dynamicField name="ts_*" type="text_und" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
 <dynamicField name="tm_X3b_und_*" type="text_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
@@ -61,8 +73,8 @@
 <dynamicField name="tum_*" type="text_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
 <dynamicField name="spellcheck_und*" type="text_spell_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
 <dynamicField name="spellcheck_*" type="text_spell_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
-<dynamicField name="sort_X3b_und_*" type="collated_und" stored="false" indexed="false" docValues="true" />
-<dynamicField name="sort_*" type="collated_und" stored="false" indexed="false" docValues="true" />
+<dynamicField name="sort_X3b_und_*" type="collated_und" stored="false" indexed="false" docValues="true" useDocValuesAsStored="false" />
+<dynamicField name="sort_*" type="collated_und" stored="false" indexed="false" docValues="true" useDocValuesAsStored="false" />
 <dynamicField name="tcngramstrings_X3b_und_*" type="text_ngramstring" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
 <dynamicField name="tcngramstrings_*" type="text_ngramstring" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
 <dynamicField name="tcngramstringm_X3b_und_*" type="text_ngramstring" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />