Merge pull request #13 from localgovdrupal/master

Let's merge to release branch and tag 1.0.0-alpha3

Author: finnlewis

composer.json

@@ -20,6 +20,9 @@
     "patches": {
       "drupal/viewsreference": {
         "Implement configuration schema for Views reference field storage+settings and widget+formatter https://www.drupal.org/project/viewsreference/issues/2957529": "https://www.drupal.org/files/issues/2020-07-16/2957529-10.viewsreference.patch"
+      },
+      "drupal/layout_paragraphs": {
+        "Fix missing schema for link in view mode: https://www.drupal.org/project/layout_paragraphs/issues/3161998": "https://www.drupal.org/files/issues/2020-07-28/missing_link_config_schema-3161998-2.patch"
       }
     }
   }

config/install/field.field.node.localgov_subsites_overview.localgov_subsites_banner.yml

@@ -14,7 +14,7 @@ entity_type: node
 bundle: localgov_subsites_overview
 label: Banner
 description: ''
-required: true
+required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''

config/optional/block.block.subsitebanner.yml

@@ -0,0 +1,21 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - localgov_subsites
+  theme:
+    - localgov_theme
+id: subsitebanner
+theme: localgov_theme
+region: banner
+weight: -7
+provider: null
+plugin: localgov_subsite_banner
+settings:
+  id: localgov_subsite_banner
+  label: 'Subsite banner'
+  provider: localgov_subsites
+  label_display: '0'
+  context_mapping:
+    node: '@node.node_route_context:node'
+visibility: {  }

config/optional/block.block.subsitenavigation.yml

@@ -0,0 +1,21 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - localgov_subsites
+  theme:
+    - localgov_theme
+id: subsitenavigation
+theme: localgov_theme
+region: sidebar_second
+weight: -7
+provider: null
+plugin: localgov_subsite_navigation
+settings:
+  id: localgov_subsite_navigation
+  label: 'Subsite navigation'
+  provider: localgov_subsites
+  label_display: visible
+  context_mapping:
+    node: '@node.node_route_context:node'
+visibility: {  }

localgov_subsites.module

@@ -54,7 +54,7 @@ function localgov_subsites_preprocess_page(&$variables) {
 
   if (in_array($node->bundle(), [
     'localgov_subsites_overview',
-    'localgov_subsites_page'
+    'localgov_subsites_page',
   ])) {
     $subsite = \Drupal::service('class_resolver')
       ->getInstanceFromDefinition(Subsite::class)

config/install/core.entity_form_display.paragraph.localgov_banner_primary.default.yml renamed to modules/localgov_subsites_paragraphs/config/install/core.entity_form_display.paragraph.localgov_banner_primary.default.yml

@@ -2,9 +2,9 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.paragraph.localgov_banner_primary.localgov_image
     - field.field.paragraph.localgov_banner_primary.localgov_subsites_banner_logo
     - field.field.paragraph.localgov_banner_primary.localgov_subsites_banner_text
-    - field.field.paragraph.localgov_banner_primary.localgov_image
     - field.field.paragraph.localgov_banner_primary.localgov_title
     - field.field.paragraph.localgov_banner_primary.localgov_url
     - paragraphs.paragraphs_type.localgov_banner_primary
@@ -15,6 +15,17 @@ targetEntityType: paragraph
 bundle: localgov_banner_primary
 mode: default
 content:
+  localgov_image:
+    weight: 0
+    label: hidden
+    settings:
+      view_mode: responsive_banner
+      link: false
+    third_party_settings:
+      field_formatter_class:
+        class: ''
+    type: entity_reference_entity_view
+    region: content
   localgov_subsites_banner_logo:
     type: entity_reference_entity_view
     weight: 4
@@ -33,17 +44,6 @@ content:
     third_party_settings: {  }
     type: basic_string
     region: content
-  localgov_image:
-    weight: 0
-    label: hidden
-    settings:
-      view_mode: responsive_hero_or_banner
-      link: false
-    third_party_settings:
-      field_formatter_class:
-        class: ''
-    type: entity_reference_entity_view
-    region: content
   localgov_title:
     weight: 1
     label: hidden

config/install/core.entity_form_display.paragraph.localgov_banner_secondary.default.yml renamed to modules/localgov_subsites_paragraphs/config/install/core.entity_form_display.paragraph.localgov_banner_secondary.default.yml

@@ -15,7 +15,7 @@ content:
     weight: 0
     label: hidden
     settings:
-      view_mode: responsive_hero_or_banner
+      view_mode: responsive_banner
       link: false
     third_party_settings:
       field_formatter_class:

config/install/core.entity_view_display.paragraph.localgov_banner_primary.default.yml renamed to modules/localgov_subsites_paragraphs/config/install/core.entity_view_display.paragraph.localgov_banner_primary.default.yml

@@ -1,9 +1,6 @@
-uuid: e479ad59-fd24-447e-9300-9e7f1e9d8c67
 langcode: en
 status: true
 dependencies: {  }
-_core:
-  default_config_hash: OhGFgbEq2S7SqeYtg2B2ZrOP6h-peTkJBx_xjKQqtz0
 id: localgov_featured_subsite
 label: 'Featured subsite'
 icon_uuid: null

config/install/core.entity_view_display.paragraph.localgov_banner_secondary.default.yml renamed to modules/localgov_subsites_paragraphs/config/install/core.entity_view_display.paragraph.localgov_banner_secondary.default.yml

@@ -27,6 +27,14 @@ function localgov_subsites_paragraphs_theme($existing, $type, $theme, $path) {
       'template' => 'paragraph--localgov-accordion-pane',
       'base hook' => 'paragraph',
     ],
+    'paragraph__localgov_banner_primary' => [
+      'template' => 'paragraph--localgov-banner-primary',
+      'base hook' => 'paragraph',
+    ],
+    'paragraph__localgov_banner_secondary' => [
+      'template' => 'paragraph--localgov-banner-secondary',
+      'base hook' => 'paragraph',
+    ],
     'paragraph__localgov_box_link' => [
       'template' => 'paragraph--localgov-box-link',
       'base hook' => 'paragraph',

config/install/field.field.paragraph.localgov_banner_primary.localgov_image.yml renamed to modules/localgov_subsites_paragraphs/config/install/field.field.paragraph.localgov_banner_primary.localgov_image.yml

@@ -0,0 +1,10 @@
+<div class="bg-white">
+  <div class="banner-header mx-auto">
+    <div class="relative subsite-banner{{ call_to_action ? ' subsite-banner--overview' }}">
+      <div class="subsite-banner__image">
+      {{ content }}
+      </div>
+    </div>
+  </div>
+</div>
+

config/install/field.field.paragraph.localgov_banner_primary.localgov_subsites_banner_logo.yml renamed to modules/localgov_subsites_paragraphs/config/install/field.field.paragraph.localgov_banner_primary.localgov_subsites_banner_logo.yml

@@ -0,0 +1,10 @@
+<div class="bg-white">
+  <div class="banner-header mx-auto">
+    <div class="relative subsite-banner{{ call_to_action ? ' subsite-banner--overview' }}">
+      <div class="subsite-banner__image">
+      {{ content }}
+      </div>
+    </div>
+  </div>
+</div>
+

config/install/field.field.paragraph.localgov_banner_primary.localgov_subsites_banner_text.yml renamed to modules/localgov_subsites_paragraphs/config/install/field.field.paragraph.localgov_banner_primary.localgov_subsites_banner_text.yml

@@ -11,7 +11,16 @@
  *   id = "localgov_subsite_banner",
  *   admin_label = "Subsite banner",
  *   context_definitions = {
- *     "node" = @ContextDefinition("entity:node", label = @Translation("Current node"))
+ *     "node" = @ContextDefinition(
+ *       "entity:node",
+ *       label = @Translation("Current node"),
+ *       constraints = {
+ *         "Bundle" = {
+ *           "localgov_subsites_overview",
+ *           "localgov_subsites_page"
+ *         },
+ *       }
+ *     )
  *   }
  * )
  */

config/install/field.field.paragraph.localgov_banner_primary.localgov_title.yml renamed to modules/localgov_subsites_paragraphs/config/install/field.field.paragraph.localgov_banner_primary.localgov_title.yml

@@ -40,6 +40,13 @@ public function build() {
     $items = [];
 
     $subsite_entity = $this->getContextValue('node');
+    // In some cases, this block might be rendered on a /node/add page. It
+    // seems that in this instancem the $subsite_entity still exists but will
+    // not have an id, so we will check first, and return nothing in the absnce
+    // of an id.
+    if (!$subsite_entity->id()) {
+      return;
+    }
     $cache = (new CacheableMetadata())->addCacheableDependency($subsite_entity);
     $storage = $this->getNestedSetStorage('localgov_subsites');
     $node = $this->getNestedSetNodeKeyFactory()->fromEntity($subsite_entity);
@@ -71,6 +78,12 @@ public function build() {
     return $build;
   }
 
+  /**
+   * Get nested set tree of links for the menu.
+   *
+   * @return array
+   *   Returns and array of nested items.
+   */
   protected function nestTree($tree, $ancestors, $entities, &$index = 0, $depth = 0) {
     $items = $item = [];
     do {
@@ -97,6 +110,9 @@ protected function nestTree($tree, $ancestors, $entities, &$index = 0, $depth =
     return $items;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   protected function formatItem(EntityInterface $entity, $in_active_trail) {
     $link = [];
     $link['title'] = $entity->label();

config/install/field.field.paragraph.localgov_banner_primary.localgov_url.yml renamed to modules/localgov_subsites_paragraphs/config/install/field.field.paragraph.localgov_banner_primary.localgov_url.yml

@@ -56,11 +56,13 @@ public function getSubsite($node) {
     if ($node instanceof NodeInterface) {
       if ($node->bundle() === 'localgov_subsites_overview') {
         $entity = $node;
-      } elseif ($id = $this->getRootId($node)) {
+      }
+      elseif ($id = $this->getRootId($node)) {
         $entity = $this->entityTypeManager->getStorage('node')->load($id);
       }
     }
 
     return $entity;
   }
+
 }