From 287ee8f4c0aaf38aa6427995ae48454d45edc970 Mon Sep 17 00:00:00 2001
From: Clayton Dewey <clayton@agaric.com>
Date: Sat, 31 Aug 2019 13:47:25 -0600
Subject: [PATCH] Add commenting to all content types except People

---
 ...y_form_display.comment.comment.default.yml | 17 +++----
 ...tity_form_display.node.article.default.yml | 43 ++++++++---------
 ....entity_form_display.node.blog.default.yml | 48 ++++++++++---------
 ...y_form_display.node.collection.default.yml |  8 ++++
 ...ity_form_display.node.gleaning.default.yml |  8 ++++
 ...form_display.node.landing_page.default.yml |  8 ++++
 ....entity_form_display.node.page.default.yml |  8 ++++
 .../sync/field.field.node.article.comment.yml |  2 +-
 config/sync/field.field.node.blog.comment.yml |  2 +-
 9 files changed, 85 insertions(+), 59 deletions(-)

diff --git a/config/sync/core.entity_form_display.comment.comment.default.yml b/config/sync/core.entity_form_display.comment.comment.default.yml
index b2bc914..03267ae 100644
--- a/config/sync/core.entity_form_display.comment.comment.default.yml
+++ b/config/sync/core.entity_form_display.comment.comment.default.yml
@@ -15,22 +15,17 @@ bundle: comment
 mode: default
 content:
   author:
-    weight: -2
+    weight: 0
     region: content
+    settings: {  }
+    third_party_settings: {  }
   comment_body:
     type: text_textarea
-    weight: 11
+    weight: 1
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
     region: content
-  subject:
-    type: string_textfield
-    weight: 10
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-    region: content
-hidden: {  }
+hidden:
+  subject: true
diff --git a/config/sync/core.entity_form_display.node.article.default.yml b/config/sync/core.entity_form_display.node.article.default.yml
index fafc5e6..7efc984 100644
--- a/config/sync/core.entity_form_display.node.article.default.yml
+++ b/config/sync/core.entity_form_display.node.article.default.yml
@@ -42,13 +42,13 @@ mode: default
 content:
   comment:
     type: comment_default
-    weight: 13
+    weight: 12
     settings: {  }
     third_party_settings: {  }
     region: content
   created:
     type: datetime_timestamp
-    weight: 10
+    weight: 9
     settings: {  }
     third_party_settings: {  }
     region: content
@@ -80,7 +80,7 @@ content:
     type: entity_reference_paragraphs
     region: content
   field_economic_sectors:
-    weight: 19
+    weight: 26
     settings:
       match_operator: CONTAINS
       size: 60
@@ -99,7 +99,7 @@ content:
     third_party_settings: {  }
     region: content
   field_institutions_structures:
-    weight: 20
+    weight: 27
     settings:
       match_operator: CONTAINS
       size: 60
@@ -108,13 +108,13 @@ content:
     type: entity_reference_autocomplete
     region: content
   field_meta_tags:
-    weight: 15
+    weight: 14
     settings: {  }
     third_party_settings: {  }
     type: metatag_firehose
     region: content
   field_movements_struggles:
-    weight: 21
+    weight: 28
     settings:
       match_operator: CONTAINS
       size: 60
@@ -123,7 +123,7 @@ content:
     type: entity_reference_autocomplete
     region: content
   field_practices_tools_strategies:
-    weight: 22
+    weight: 29
     settings:
       match_operator: CONTAINS
       size: 60
@@ -132,13 +132,13 @@ content:
     type: entity_reference_autocomplete
     region: content
   field_publication_date:
-    weight: 25
+    weight: 24
     settings: {  }
     third_party_settings: {  }
     type: datetime_default
     region: content
   field_regions:
-    weight: 24
+    weight: 30
     settings:
       match_operator: CONTAINS
       size: 60
@@ -164,28 +164,22 @@ content:
     region: content
   field_tags:
     type: entity_reference_autocomplete_tags
-    weight: 8
+    weight: 7
     settings:
       match_operator: CONTAINS
       size: 60
       placeholder: ''
     third_party_settings: {  }
     region: content
-  field_topics:
-    weight: 7
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
   field_upload:
-    weight: 18
+    weight: 17
     settings:
       progress_indicator: throbber
     third_party_settings: {  }
     type: file_generic
     region: content
   field_visions_models:
-    weight: 23
+    weight: 31
     settings:
       match_operator: CONTAINS
       size: 60
@@ -195,7 +189,7 @@ content:
     region: content
   path:
     type: path
-    weight: 14
+    weight: 13
     settings: {  }
     third_party_settings: {  }
     region: content
@@ -203,21 +197,21 @@ content:
     type: boolean_checkbox
     settings:
       display_label: true
-    weight: 11
+    weight: 10
     third_party_settings: {  }
     region: content
   status:
     type: boolean_checkbox
     settings:
       display_label: true
-    weight: 16
+    weight: 15
     region: content
     third_party_settings: {  }
   sticky:
     type: boolean_checkbox
     settings:
       display_label: true
-    weight: 12
+    weight: 11
     third_party_settings: {  }
     region: content
   title:
@@ -230,7 +224,7 @@ content:
     region: content
   uid:
     type: entity_reference_autocomplete
-    weight: 9
+    weight: 8
     settings:
       match_operator: CONTAINS
       size: 60
@@ -238,9 +232,10 @@ content:
     third_party_settings: {  }
     region: content
   url_redirects:
-    weight: 17
+    weight: 16
     region: content
     settings: {  }
     third_party_settings: {  }
 hidden:
   body: true
+  field_topics: true
diff --git a/config/sync/core.entity_form_display.node.blog.default.yml b/config/sync/core.entity_form_display.node.blog.default.yml
index 119e391..00c408e 100644
--- a/config/sync/core.entity_form_display.node.blog.default.yml
+++ b/config/sync/core.entity_form_display.node.blog.default.yml
@@ -23,6 +23,7 @@ dependencies:
     - node.type.blog
   module:
     - comment
+    - cshs
     - file
     - focal_point
     - metatag
@@ -37,14 +38,14 @@ bundle: blog
 mode: default
 content:
   comment:
-    weight: 12
+    weight: 11
     settings: {  }
     third_party_settings: {  }
     type: comment_default
     region: content
   created:
     type: datetime_timestamp
-    weight: 8
+    weight: 7
     settings: {  }
     third_party_settings: {  }
     region: content
@@ -70,7 +71,7 @@ content:
     type: entity_reference_paragraphs
     region: content
   field_economic_sectors:
-    weight: 52
+    weight: 16
     settings:
       match_operator: CONTAINS
       size: 60
@@ -89,7 +90,7 @@ content:
     type: image_focal_point
     region: content
   field_institutions_structures:
-    weight: 53
+    weight: 17
     settings:
       match_operator: CONTAINS
       size: 60
@@ -98,13 +99,13 @@ content:
     type: entity_reference_autocomplete
     region: content
   field_meta_tags:
-    weight: 13
+    weight: 12
     settings: {  }
     third_party_settings: {  }
     type: metatag_firehose
     region: content
   field_movements_struggles:
-    weight: 54
+    weight: 18
     settings:
       match_operator: CONTAINS
       size: 60
@@ -113,7 +114,7 @@ content:
     type: entity_reference_autocomplete
     region: content
   field_practices_tools_strategies:
-    weight: 55
+    weight: 19
     settings:
       match_operator: CONTAINS
       size: 60
@@ -122,7 +123,7 @@ content:
     type: entity_reference_autocomplete
     region: content
   field_regions:
-    weight: 56
+    weight: 20
     settings:
       match_operator: CONTAINS
       size: 60
@@ -139,7 +140,7 @@ content:
     type: text_textarea
     region: content
   field_tags:
-    weight: 6
+    weight: 5
     settings:
       match_operator: CONTAINS
       size: 60
@@ -148,20 +149,23 @@ content:
     type: entity_reference_autocomplete_tags
     region: content
   field_topics:
-    weight: 5
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
+    type: cshs
+    weight: 22
     region: content
+    settings:
+      parent: 0
+      level_labels: ''
+      force_deepest: false
+    third_party_settings: {  }
   field_upload:
-    weight: 51
+    weight: 15
     settings:
       progress_indicator: throbber
     third_party_settings: {  }
     type: file_generic
     region: content
   field_visions_models:
-    weight: 57
+    weight: 21
     settings:
       match_operator: CONTAINS
       size: 60
@@ -171,7 +175,7 @@ content:
     region: content
   path:
     type: path
-    weight: 11
+    weight: 10
     settings: {  }
     third_party_settings: {  }
     region: content
@@ -179,21 +183,21 @@ content:
     type: boolean_checkbox
     settings:
       display_label: true
-    weight: 9
+    weight: 8
     third_party_settings: {  }
     region: content
   status:
     type: boolean_checkbox
     settings:
       display_label: true
-    weight: 14
+    weight: 13
     region: content
     third_party_settings: {  }
   sticky:
     type: boolean_checkbox
     settings:
       display_label: true
-    weight: 10
+    weight: 9
     third_party_settings: {  }
     region: content
   title:
@@ -206,7 +210,7 @@ content:
     region: content
   uid:
     type: entity_reference_autocomplete
-    weight: 7
+    weight: 6
     settings:
       match_operator: CONTAINS
       size: 60
@@ -214,9 +218,9 @@ content:
     third_party_settings: {  }
     region: content
   url_redirects:
-    weight: 50
+    weight: 14
+    region: content
     settings: {  }
     third_party_settings: {  }
-    region: content
 hidden:
   body: true
diff --git a/config/sync/core.entity_form_display.node.collection.default.yml b/config/sync/core.entity_form_display.node.collection.default.yml
index f825fa8..a63bd3d 100644
--- a/config/sync/core.entity_form_display.node.collection.default.yml
+++ b/config/sync/core.entity_form_display.node.collection.default.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - field.field.node.collection.body
+    - field.field.node.collection.comment
     - field.field.node.collection.field_authors
     - field.field.node.collection.field_collection_items
     - field.field.node.collection.field_collection_type
@@ -15,6 +16,7 @@ dependencies:
     - image.style.thumbnail
     - node.type.collection
   module:
+    - comment
     - image
     - metatag
     - path
@@ -26,6 +28,12 @@ targetEntityType: node
 bundle: collection
 mode: default
 content:
+  comment:
+    weight: 26
+    settings: {  }
+    third_party_settings: {  }
+    type: comment_default
+    region: content
   created:
     type: datetime_timestamp
     weight: 10
diff --git a/config/sync/core.entity_form_display.node.gleaning.default.yml b/config/sync/core.entity_form_display.node.gleaning.default.yml
index fb94091..ec0daa3 100644
--- a/config/sync/core.entity_form_display.node.gleaning.default.yml
+++ b/config/sync/core.entity_form_display.node.gleaning.default.yml
@@ -4,11 +4,13 @@ status: true
 dependencies:
   config:
     - field.field.node.gleaning.body
+    - field.field.node.gleaning.comment
     - field.field.node.gleaning.field_image
     - field.field.node.gleaning.field_upload
     - image.style.thumbnail
     - node.type.gleaning
   module:
+    - comment
     - file
     - image
     - path
@@ -27,6 +29,12 @@ content:
       placeholder: ''
     third_party_settings: {  }
     region: content
+  comment:
+    weight: 124
+    settings: {  }
+    third_party_settings: {  }
+    type: comment_default
+    region: content
   created:
     type: datetime_timestamp
     weight: 10
diff --git a/config/sync/core.entity_form_display.node.landing_page.default.yml b/config/sync/core.entity_form_display.node.landing_page.default.yml
index d2de315..244b533 100644
--- a/config/sync/core.entity_form_display.node.landing_page.default.yml
+++ b/config/sync/core.entity_form_display.node.landing_page.default.yml
@@ -3,10 +3,12 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.node.landing_page.comment
     - field.field.node.landing_page.field_body_paragraph
     - field.field.node.landing_page.field_meta_tags
     - node.type.landing_page
   module:
+    - comment
     - metatag
     - paragraphs
     - path
@@ -17,6 +19,12 @@ targetEntityType: node
 bundle: landing_page
 mode: default
 content:
+  comment:
+    weight: 51
+    settings: {  }
+    third_party_settings: {  }
+    type: comment_default
+    region: content
   created:
     type: datetime_timestamp
     weight: 3
diff --git a/config/sync/core.entity_form_display.node.page.default.yml b/config/sync/core.entity_form_display.node.page.default.yml
index 5415de9..e2ca52c 100644
--- a/config/sync/core.entity_form_display.node.page.default.yml
+++ b/config/sync/core.entity_form_display.node.page.default.yml
@@ -4,11 +4,13 @@ status: true
 dependencies:
   config:
     - field.field.node.page.body
+    - field.field.node.page.comment
     - field.field.node.page.field_body_paragraph
     - field.field.node.page.field_meta_tags
     - field.field.node.page.field_summary
     - node.type.page
   module:
+    - comment
     - metatag
     - paragraphs
     - path
@@ -20,6 +22,12 @@ targetEntityType: node
 bundle: page
 mode: default
 content:
+  comment:
+    weight: 51
+    settings: {  }
+    third_party_settings: {  }
+    type: comment_default
+    region: content
   created:
     type: datetime_timestamp
     weight: 4
diff --git a/config/sync/field.field.node.article.comment.yml b/config/sync/field.field.node.article.comment.yml
index b4353db..19224af 100644
--- a/config/sync/field.field.node.article.comment.yml
+++ b/config/sync/field.field.node.article.comment.yml
@@ -30,6 +30,6 @@ settings:
   default_mode: 1
   per_page: 50
   anonymous: 1
-  form_location: true
+  form_location: false
   preview: 0
 field_type: comment
diff --git a/config/sync/field.field.node.blog.comment.yml b/config/sync/field.field.node.blog.comment.yml
index e44a9e0..a445a07 100644
--- a/config/sync/field.field.node.blog.comment.yml
+++ b/config/sync/field.field.node.blog.comment.yml
@@ -30,6 +30,6 @@ settings:
   default_mode: 1
   per_page: 50
   anonymous: 1
-  form_location: true
+  form_location: false
   preview: 0
 field_type: comment