2.1.21 release

modules/localgov_services_landing/config/install/core.entity_form_display.node.localgov_services_landing.default.yml

@@ -30,7 +30,7 @@ third_party_settings:
       children:
         - title
         - body
-      label: Description
+      label: Content
       region: content
       parent_name: group_tabs
       weight: 1

modules/localgov_services_navigation/css/children.css

@@ -4,13 +4,13 @@
  */
 
 div.localgov-services-children-list.item-list {
-  max-height: 20vh;
-  overflow-y: scroll;
   position: sticky;
-  top: 0;
   z-index: 100;
-  background-color: #dde;
+  top: 0;
+  overflow-y: scroll;
+  max-height: 20vh;
   padding: 0.5em;
+  background-color: #dde;
 }
 
 .localgov-services-children-list h3 {
@@ -19,27 +19,27 @@ div.localgov-services-children-list.item-list {
 
 .localgov-services-children-list.item-list ul,
 .localgov-services-children-list.item-list ul li {
-  list-style-type: none;
   margin: 0;
+  list-style-type: none;
 }
 
 .localgov-services-children-list.item-list ul li {
   display: inline-block;
-	vertical-align: top;
   margin: 0.1em;
+  vertical-align: top;
 }
 
 div.localgov-child-drag {
+  position: relative;
+  top: 0;
   min-height: 5em;
   border: solid 1px black;
   background-color: #eef;
-	position: relative;
-	top: 0;
 }
 
 div.localgov-child-drag.draggable {
-  cursor: move;
   padding: 0 0.5em 0.2em 0.5em;
+  cursor: move;
 }
 
 .localgov-child-title {
@@ -50,9 +50,9 @@ div.localgov-child-drag.draggable {
 
 .localgov-child-type {
   display: block;
-  font-weight: lighter;
   font-size: 0.8em;
-	font-style: italic;
+  font-weight: lighter;
+  font-style: italic;
 }
 
 .localgov-child-topics {
@@ -62,10 +62,8 @@ div.localgov-child-drag.draggable {
 
 .localgov-child-info {
   display: block;
-  font-weight: lighter;
-  font-size: 0.8em;
+  text-align: right;
   color: #666;
-	text-align: right;
-
+  font-size: 0.8em;
+  font-weight: lighter;
 }
-

modules/localgov_services_navigation/js/children.js

@@ -15,109 +15,135 @@
  * content for different field types, so for more compatibility maybe an
  * additional library would be required.
  */
-(function ($, Drupal) {
-
-  var dragChild;
+(function localgovServiceChildScript(Drupal, once) {
+  let dragChild;
 
   Drupal.behaviors.localgovServiceChild = {
-    attach: function attach(context, settings) {
+    attach: function attach(context) {
       // Add draggability to child items.
-      var child = $('.localgov-child-drag');
-      child.each(function() {
-        this.setAttribute('draggable', true);
-        this.classList.add('draggable');
-        this.addEventListener('dragstart', function (event) {
-          event.dataTransfer.dropEffect = "move";
-          event.dataTransfer.effectAllowed = "move";
-          dragChild = this;
+      const children = once(
+        'allServicesChildren',
+        '.localgov-child-drag',
+        context,
+      );
+      if (children) {
+        children.forEach((child) => {
+          child.setAttribute('draggable', true);
+          child.classList.add('draggable');
+          child.addEventListener('dragstart', (event) => {
+            event.dataTransfer.dropEffect = 'move';
+            event.dataTransfer.effectAllowed = 'move';
+            dragChild = child;
+          });
         });
-      });
-    }
+      }
+    },
   };
 
   Drupal.behaviors.localgovServiceTaskDrop = {
-    attach: function attach(context, settings) {
+    attach: function attach(context) {
       // Is it always a table. Maybe form-item and then parent?
-      var linkRow = $("[data-drupal-selector='edit-localgov-common-tasks'] tr");
-      linkRow.each(function() {
-        this.addEventListener('dragover', function (event) {
-          var row = $(event.target).closest('tr');
-          var url = $("input[data-drupal-selector$=uri]", row);
-          if (url.val() == '') {
+      const linkRows = once(
+        'allServicesLinkRows',
+        '[data-drupal-selector="edit-localgov-common-tasks"] tr',
+        context,
+      );
+      linkRows.forEach((row) => {
+        row.addEventListener('dragover', (event) => {
+          const targetRow = event.target.closest('tr');
+          const url = targetRow.querySelector(
+            'input[data-drupal-selector$=uri]',
+          );
+          if (url.value === '') {
             event.preventDefault();
-            event.dataTransfer.dropEffect = "move";
+            event.dataTransfer.dropEffect = 'move';
           }
         });
-        this.addEventListener('drop', function(event) {
-          var row = $(event.target).closest('tr');
-          var url = $("input[data-drupal-selector$=uri]", row);
-          if (url.val() == '') {
+        row.addEventListener('drop', (event) => {
+          const targetRow = event.target.closest('tr');
+          const url = targetRow.querySelector(
+            'input[data-drupal-selector$=uri]',
+          );
+          if (url.value === '') {
             event.preventDefault();
-            var title = $("input[data-drupal-selector$=title]", row);
-            title.val(dragChild.getAttribute('data-localgov-title'));
-            url.val(dragChild.getAttribute('data-localgov-url'));
-            $(dragChild).remove();
+            const title = targetRow.querySelector(
+              'input[data-drupal-selector$=title]',
+            );
+            title.value = dragChild.getAttribute('data-localgov-title');
+            url.value = dragChild.getAttribute('data-localgov-url');
+            dragChild.remove();
           }
         });
       });
-    }
+    },
   };
 
   Drupal.behaviors.localgovServiceChildDrop = {
-    attach: function attach(context, settings) {
-      var linkRow = $("[data-drupal-selector='edit-localgov-destinations'] tr");
-      linkRow.each(function() {
-        this.addEventListener('dragover', function (event) {
-          var row = $(event.target).closest('tr');
-          var ref = $("input[data-drupal-selector$=target-id]", row);
-          if (ref.val() == '') {
+    attach: function attach(context) {
+      const linkRows = once(
+        'allServicesLinkRows',
+        '[data-drupal-selector="edit-localgov-destinations"] tr',
+        context,
+      );
+      linkRows.forEach((row) => {
+        row.addEventListener('dragover', (event) => {
+          const ref = row.querySelector(
+            'input[data-drupal-selector$=target-id]',
+          );
+          if (ref.value === '') {
             event.preventDefault();
-            event.dataTransfer.dropEffect = "move";
+            event.dataTransfer.dropEffect = 'move';
           }
         });
-        this.addEventListener('drop', function(event) {
-          var row = $(event.target).closest('tr');
-          var ref = $("input[data-drupal-selector$=target-id]", row);
-          if (ref.val() == '') {
+        row.addEventListener('drop', (event) => {
+          const ref = row.querySelector(
+            'input[data-drupal-selector$=target-id]',
+          );
+          if (ref.value === '') {
             event.preventDefault();
-            ref.val(dragChild.getAttribute('data-localgov-reference'));
-            $(dragChild).remove();
+            ref.value = dragChild.getAttribute('data-localgov-reference');
+            dragChild.remove();
           }
         });
       });
-    }
+    },
   };
 
   Drupal.behaviors.localgovServiceSubChildDrop = {
-    attach: function attach(context, settings) {
-      var linkRow = $("[data-drupal-selector$='-subform-topic-list-links'] tr");
-      linkRow.each(function() {
-        this.addEventListener('dragover', function (event) {
-          var row = $(event.target).closest('tr');
-          var url = $("input[data-drupal-selector$=uri]", row);
-          if (url.val() == '') {
+    attach: function attach(context) {
+      const linkRows = once(
+        'allServicesLinkRows',
+        '[data-drupal-selector$="-subform-topic-list-links"] tr',
+        context,
+      );
+      linkRows.forEach((row) => {
+        row.addEventListener('dragover', (event) => {
+          const url = row.querySelector('input[data-drupal-selector$=uri]');
+          if (url.value === '') {
             event.preventDefault();
-            event.dataTransfer.dropEffect = "move";
+            event.dataTransfer.dropEffect = 'move';
           }
         });
-        this.addEventListener('drop', function(event) {
-          var row = $(event.target).closest('tr');
-          var url = $("input[data-drupal-selector$=uri]", row);
-          if (url.val() == '') {
+        row.addEventListener('drop', (event) => {
+          const url = row.querySelector('input[data-drupal-selector$=uri]');
+          if (url.value === '') {
             event.preventDefault();
-            var title = $("input[data-drupal-selector$=title]", row);
-            title.val(dragChild.getAttribute('data-localgov-title'));
-            url.val(dragChild.getAttribute('data-localgov-url'));
-            $(dragChild).remove();
+            const title = row.querySelector(
+              'input[data-drupal-selector$=title]',
+            );
+            title.value = dragChild.getAttribute('data-localgov-title');
+            url.value = dragChild.getAttribute('data-localgov-url');
+            dragChild.remove();
           }
         });
       });
-    }
+    },
   };
 
   // Account for menus for sticky position.
-  $(document).on('drupalViewportOffsetChange', function () {
-    $('div.localgov-services-children-list.item-list').css('top', $('body').css('padding-top'));
+  document.addEventListener('drupalViewportOffsetChange', () => {
+    document.querySelector(
+      'div.localgov-services-children-list.item-list',
+    ).style.top = getComputedStyle(document.body).paddingTop;
   });
-
-})(jQuery, Drupal);
+})(Drupal, once);

modules/localgov_services_navigation/src/EntityChildRelationshipUi.php

@@ -4,14 +4,14 @@
 
 use Drupal\Component\Utility\Html;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Entity\ContentEntityFormInterface;
 use Drupal\Core\Entity\EntityRepositoryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
-use Drupal\node\NodeForm;
 use Drupal\node\NodeInterface;
 use Drupal\taxonomy\TermInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -119,13 +119,21 @@ public function entityExtraFieldInfo() {
    */
   public function formAlter(array &$form, FormStateInterface $form_state, $form_id) {
     $form_object = $form_state->getFormObject();
-    if (
-      $form_object instanceof NodeForm &&
-      ($node = $form_object->getEntity()) &&
-      in_array($node->bundle(), [
-        'localgov_services_landing',
-        'localgov_services_sublanding',
-      ]) &&
+
+    // Must be a content entity form on a node.
+    if (!$form_object instanceof ContentEntityFormInterface) {
+      return;
+    }
+
+    $node = $form_object->getEntity();
+    if (!$node instanceof NodeInterface) {
+      return;
+    }
+
+    if (in_array($node->bundle(), [
+      'localgov_services_landing',
+      'localgov_services_sublanding',
+    ]) &&
       $node->id()
     ) {
       $form['localgov_services_navigation_children'] = [

modules/localgov_services_navigation/tests/src/Kernel/ChildReferencesTest.php

@@ -278,8 +278,8 @@ public function testChildWithTaxonomy() {
     $node->save();
 
     // Mock node form and form state classes.
-    $methods = get_class_methods('Drupal\node\NodeForm');
-    $node_form = $this->getMockBuilder('Drupal\node\NodeForm')
+    $methods = get_class_methods('Drupal\Core\Entity\ContentEntityFormInterface');
+    $node_form = $this->getMockBuilder('Drupal\Core\Entity\ContentEntityFormInterface')
       ->disableOriginalConstructor()
       ->onlyMethods($methods)
       ->getMock();