nsf-open / nsf

Repo for the NSF Site Redesign & Content Discovery project
https://nsf-demo.app.cloud.gov
GNU General Public License v2.0
4 stars 4 forks source link

Account for divergent configurations #189

Closed cmc333333 closed 6 years ago

cmc333333 commented 6 years ago

User story

As a site developer, I want to see as few config diffs as possible so that my commits are concise.

Currently, if we do a fresh install locally and then run

bin/drupal config:export

we'll get several changes to our configs (as evident in git diff). Some of these are easy to explain, some less so.

--- a/web/sites/default/config/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This directory structure contains the staging config for your site.
diff --git a/web/sites/default/config/brightcove.brightcove_api_client.nsf_brightcove.yml b/web/sites/default/config/brightcove.brightcove_api_client.nsf_brightcove.yml
index 1f043c8..eae2944 100644
--- a/web/sites/default/config/brightcove.brightcove_api_client.nsf_brightcove.yml
+++ b/web/sites/default/config/brightcove.brightcove_api_client.nsf_brightcove.yml
@@ -6,8 +6,8 @@ _core:
   default_config_hash: mJhmisLlSYTJccOgeEcFWivzXD9BrliG8wDm1TmuNdA
 id: nsf_brightcove
 label: 'NSF Brightcove'
-account_id: ''
-client_id: ''
+account_id: SECRET
+client_id: SECRET
 default_player: default
-secret_key: ''
+secret_key: SECRET
 max_custom_fields: 10
diff --git a/web/sites/default/config/core.entity_form_display.block_content.basic.default.yml b/web/sites/default/config/core.entity_form_display.block_content.basic.default.yml
index 8e24fcc..34dd2a4 100644
--- a/web/sites/default/config/core.entity_form_display.block_content.basic.default.yml
+++ b/web/sites/default/config/core.entity_form_display.block_content.basic.default.yml
@@ -31,4 +31,10 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  moderation_state:
+    type: moderation_state_default
+    weight: 100
+    settings: {  }
+    region: content
+    third_party_settings: {  }
 hidden: {  }
diff --git a/web/sites/default/config/core.entity_form_display.node.page.default.yml b/web/sites/default/config/core.entity_form_display.node.page.default.yml
index efe86e8..7e7bc2d 100644
--- a/web/sites/default/config/core.entity_form_display.node.page.default.yml
+++ b/web/sites/default/config/core.entity_form_display.node.page.default.yml
@@ -30,6 +30,12 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
+  moderation_state:
+    type: moderation_state_default
+    weight: 100
+    settings: {  }
+    region: content
+    third_party_settings: {  }
   path:
     type: path
     weight: 30
@@ -43,6 +49,12 @@ content:
     weight: 15
     region: content
     third_party_settings: {  }
+  publish_on:
+    type: datetime_timestamp_no_default
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   status:
     type: boolean_checkbox
     settings:
@@ -74,4 +86,10 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  unpublish_on:
+    type: datetime_timestamp_no_default
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
 hidden: {  }
diff --git a/web/sites/default/config/core.entity_form_display.user.user.default.yml b/web/sites/default/config/core.entity_form_display.user.user.default.yml
index d1fd7df..df4c8c9 100644
--- a/web/sites/default/config/core.entity_form_display.user.user.default.yml
+++ b/web/sites/default/config/core.entity_form_display.user.user.default.yml
@@ -24,6 +24,12 @@ content:
   language:
     weight: 0
     region: content
+  path:
+    type: path
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   timezone:
     weight: 6
     region: content
diff --git a/web/sites/default/config/core.entity_view_display.node.news.teaser.yml b/web/sites/default/config/core.entity_view_display.node.news.teaser.yml
index d3bf7dc..79fdcae 100644
--- a/web/sites/default/config/core.entity_view_display.node.news.teaser.yml
+++ b/web/sites/default/config/core.entity_view_display.node.news.teaser.yml
@@ -25,4 +25,11 @@ content:
   links:
     weight: 100
     region: content
-hidden: {  }
+hidden:
+  field_caption: true
+  field_featured_image: true
+  field_funding: true
+  field_media_queries: true
+  field_press_release_number: true
+  field_publication_date: true
+  field_subtitle: true
diff --git a/web/sites/default/config/core.entity_view_display.user.user.compact.yml b/web/sites/default/config/core.entity_view_display.user.user.compact.yml
index bedb162..065e8a9 100644
--- a/web/sites/default/config/core.entity_view_display.user.user.compact.yml
+++ b/web/sites/default/config/core.entity_view_display.user.user.compact.yml
@@ -16,6 +16,9 @@ targetEntityType: user
 bundle: user
 mode: compact
 content:
+  masquerade:
+    weight: 50
+    region: content
   user_picture:
     type: image
     weight: 0
diff --git a/web/sites/default/config/core.entity_view_display.user.user.default.yml b/web/sites/default/config/core.entity_view_display.user.user.default.yml
index 175e51b..3d0c772 100644
--- a/web/sites/default/config/core.entity_view_display.user.user.default.yml
+++ b/web/sites/default/config/core.entity_view_display.user.user.default.yml
@@ -15,6 +15,9 @@ targetEntityType: user
 bundle: user
 mode: default
 content:
+  masquerade:
+    weight: 50
+    region: content
   member_for:
     weight: 5
     region: content
diff --git a/web/sites/default/config/scheduler.settings.yml b/web/sites/default/config/scheduler.settings.yml
index ca74d6a..1c6cf81 100644
--- a/web/sites/default/config/scheduler.settings.yml
+++ b/web/sites/default/config/scheduler.settings.yml
@@ -13,7 +13,7 @@ default_time: '09:00:00'
 default_unpublish_enable: false
 default_unpublish_required: false
 default_unpublish_revision: false
-lightweight_cron_access_key: 0f18f312c39cb2e0ab85
+lightweight_cron_access_key: BkpiTOLk5iZgJbtaLjjB8Bt1pkS/u42lA6KFWKKoFrM=
 log: true
 time_letters: hHgGisaA
 time_only_format: 'H:i:s'
diff --git a/web/sites/default/config/search.settings.yml b/web/sites/default/config/search.settings.yml
index 52301dd..8d3840d 100644
--- a/web/sites/default/config/search.settings.yml
+++ b/web/sites/default/config/search.settings.yml
@@ -1,5 +1,4 @@
 and_or_limit: 7
-default_page: node_search
 index:
   cron_limit: 100
   overlap_cjk: true
diff --git a/web/sites/default/config/update.settings.yml b/web/sites/default/config/update.settings.yml
index 94078f0..55b4646 100644
--- a/web/sites/default/config/update.settings.yml
+++ b/web/sites/default/config/update.settings.yml
@@ -7,7 +7,7 @@ fetch:
   timeout: 30
 notification:
   emails:
-    - [snipped]
+    - admin@example.org
   threshold: all
 _core:
   default_config_hash: 2QzULf0zovJQx3J06Y9rufzzfi-CY2CTTlEfJJh2Qyw

There's also a new web/sites/default/config/field.field.node.article.body.yml file.

Suggested path forward:

Acceptance criteria