Merge branch 'development'

dof-dss · Sep 2, 2020 · 2daa709 · 2daa709
2 parents 5be36d8 + 8955a4a
commit 2daa709
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 23 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -75,6 +75,27 @@ jobs:
           root: ./
           paths:
             - ./
+  build_edge_branch:
+    docker:
+      - image: circleci/php:7.3.14-apache-browsers
+    steps:
+      - checkout_code
+      - install_php_os_extensions
+      - run:
+          name: Switch to edge build branch
+          command: |
+            cd ~/project
+            git checkout -b $EDGE_BUILD_BRANCH
+      - run:
+          name: Install dev versions of dof-dss packages with composer.
+          command: |
+            composer require dof-dss/nidirect-site-modules:dev-development dof-dss/nidirect-migrations: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
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - ./
 
   # Test for coding standards and deprecated code.
   static_analysis:
@@ -346,9 +367,10 @@ workflows:
               only:
                 - development
     jobs:
-      - build
-      - sync_data
+      - build_edge_branch
+      - sync_data:
+          requires:
+            - build_edge_branch
       - functional_tests:
           requires:
-            - build
             - sync_data
diff --git a/composer.json b/composer.json
@@ -37,7 +37,7 @@
         "dof-dss/nicsdru_origins_theme": "^0.3.1",
         "dof-dss/nidirect-d8-test-install-profile": "^0.2.2",
         "dof-dss/nidirect-migrations": "^0.10.0",
-        "dof-dss/nidirect-site-modules": "^0.10.2",
+        "dof-dss/nidirect-site-modules": "^0.10.3",
         "drupal/address": "^1.7",
         "drupal/admin_toolbar": "^2.0",
         "drupal/adminimal_theme": "^1.5",
@@ -172,6 +172,9 @@
             },
             "drupal/paragraphs": {
                 "Integrity constraint violation: 1048 Column 'langcode' cannot be null": "https://www.drupal.org/files/issues/2020-06-25/paragraphs-2901390-51.patch"
+            },
+            "drupal/shs": {
+                "SHS select is empty on views": "https://www.drupal.org/files/issues/2018-12-10/shs-blank-select-fix-3019378-3.patch"
             }
         },
         "composer-exit-on-patch-failure": true,

diff --git a/composer.lock b/composer.lock
diff --git a/config/sync/user.role.anonymous.yml b/config/sync/user.role.anonymous.yml
@@ -19,3 +19,4 @@ permissions:
   - 'view files'
   - 'view media'
   - 'view published gp entities'
+  - 'view terms in site_themes'
diff --git a/config/sync/views.view.contacts.yml b/config/sync/views.view.contacts.yml
@@ -194,7 +194,7 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           parse_mode: phrase
-          min_length: 3
+          min_length: 2
           fields:
             - title_fulltext
           plugin_id: search_api_fulltext
@@ -253,7 +253,6 @@ display:
       relationships: {  }
       arguments: {  }
       display_extenders: {  }
-      title: Contacts
     cache_metadata:
       max-age: -1
       contexts:
@@ -263,7 +262,9 @@ display:
         - url.query_args
         - 'url.query_args:sort_by'
         - 'url.query_args:sort_order'
-      tags: {  }
+        - 'user.node_grants:view'
+      tags:
+        - 'config:search_api.index.contacts'
   contact_search:
     display_plugin: embed
     id: contact_search
@@ -281,4 +282,6 @@ display:
         - url.query_args
         - 'url.query_args:sort_by'
         - 'url.query_args:sort_order'
-      tags: {  }
+        - 'user.node_grants:view'
+      tags:
+        - 'config:search_api.index.contacts'
diff --git a/config/sync/views.view.site_themes.yml b/config/sync/views.view.site_themes.yml
@@ -493,17 +493,19 @@ display:
           entity_type: flagging
           plugin_id: flag_filter
       sorts:
-        field_taxonomy_rank_value:
-          id: field_taxonomy_rank_value
-          table: taxonomy_term__field_taxonomy_rank
-          field: field_taxonomy_rank_value
+        weight:
+          id: weight
+          table: taxonomy_term_field_data
+          field: weight
           relationship: none
           group_type: group
           admin_label: ''
           order: ASC
           exposed: false
           expose:
             label: ''
+          entity_type: taxonomy_term
+          entity_field: weight
           plugin_id: standard
         name:
           id: name