Merge pull request #145 from localgovdrupal/1.x

Release 1.0.0-alpha6 or 1.0.0-beta1?
localgovdrupal · Feb 20, 2024 · cf1f8e5 · cf1f8e5
2 parents 0da5f36 + 41694be
commit cf1f8e5
Show file tree

Hide file tree

Showing 32 changed files with 406 additions and 411 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,6 +1,3 @@
-##
-# Managed by https://github.com/localgovdrupal/github_workflow_manager
----
 name: Test localgovdrupal/localgov_publications drupal-module
 
 on:
@@ -211,4 +208,4 @@ jobs:
           mkdir -p ./html/web/sites/simpletest && chmod 777 ./html/web/sites/simpletest
           sed -i "s#http://localgov.lndo.site#http://drupal#" ./html/phpunit.xml.dist
           docker exec -t drupal bash -c 'chown docker:docker -R /var/www/html'
-          docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4 ${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}"
+          docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/phpunit /var/www/html/${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}"
diff --git a/composer.json b/composer.json
@@ -13,10 +13,8 @@
     ],
     "require": {
         "drupal/auto_heading_ids": "^2.0@beta",
-        "drupal-ckeditor-libraries-group/fakeobjects": "^4.0",
-        "drupal/footnotes": "^3.0",
         "localgovdrupal/localgov_core": ">=2.1.10",
-        "localgovdrupal/localgov_paragraphs": ">=2.3.2"
+        "localgovdrupal/localgov_paragraphs": ">=2.4.0"
     },
     "require-dev": {
         "drupal/coder": "*"

diff --git a/config/install/core.entity_form_display.node.localgov_publication_cover_page.default.yml b/config/install/core.entity_form_display.node.localgov_publication_cover_page.default.yml
@@ -2,27 +2,26 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.node.localgov_publication_cover_page.body
-    - field.field.node.localgov_publication_cover_page.localgov_publications_banner
     - field.field.node.localgov_publication_cover_page.localgov_documents
     - field.field.node.localgov_publication_cover_page.localgov_publication
+    - field.field.node.localgov_publication_cover_page.localgov_publication_content
+    - field.field.node.localgov_publication_cover_page.localgov_publications_banner
     - field.field.node.localgov_publication_cover_page.localgov_published_date
     - field.field.node.localgov_publication_cover_page.localgov_updated_date
     - node.type.localgov_publication_cover_page
   module:
     - datetime
     - field_group
+    - layout_paragraphs
     - media_library
     - paragraphs
     - path
-    - text
 third_party_settings:
   field_group:
     group_tabs:
       children:
         - group_description
         - group_banner
-        - group_page_builder
         - group_documents
       label: Tabs
       region: content
@@ -38,7 +37,7 @@ third_party_settings:
     group_description:
       children:
         - title
-        - body
+        - localgov_publication_content
         - localgov_published_date
         - localgov_updated_date
       label: Description
@@ -75,7 +74,7 @@ third_party_settings:
       label: Documents
       region: content
       parent_name: group_tabs
-      weight: 20
+      weight: 19
       format_type: tab
       format_settings:
         classes: ''
@@ -89,33 +88,11 @@ targetEntityType: node
 bundle: localgov_publication_cover_page
 mode: default
 content:
-  body:
-    type: text_textarea_with_summary
-    weight: 2
-    region: content
-    settings:
-      rows: 9
-      summary_rows: 3
-      placeholder: ''
-      show_summary: false
-    third_party_settings: {  }
   created:
     type: datetime_timestamp
-    weight: 3
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  localgov_publications_banner:
-    type: entity_reference_paragraphs
     weight: 2
     region: content
-    settings:
-      title: Banner
-      title_plural: Banner
-      edit_mode: open
-      add_mode: button
-      form_display_mode: default
-      default_paragraph_type: localgov_publications_banner
+    settings: {  }
     third_party_settings: {  }
   localgov_documents:
     type: media_library_widget
@@ -134,6 +111,28 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  localgov_publication_content:
+    type: layout_paragraphs
+    weight: 2
+    region: content
+    settings:
+      preview_view_mode: default
+      nesting_depth: 0
+      require_layouts: 0
+      empty_message: ''
+    third_party_settings: {  }
+  localgov_publications_banner:
+    type: entity_reference_paragraphs
+    weight: 4
+    region: content
+    settings:
+      title: Banner
+      title_plural: Banner
+      edit_mode: open
+      add_mode: button
+      form_display_mode: default
+      default_paragraph_type: localgov_publications_banner
+    third_party_settings: {  }
   localgov_published_date:
     type: datetime_default
     weight: 4
@@ -148,32 +147,32 @@ content:
     third_party_settings: {  }
   path:
     type: path
-    weight: 7
+    weight: 6
     region: content
     settings: {  }
     third_party_settings: {  }
   promote:
     type: boolean_checkbox
-    weight: 5
+    weight: 4
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   simple_sitemap:
-    weight: 4
+    weight: 3
     region: content
     settings: {  }
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 8
+    weight: 7
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   sticky:
     type: boolean_checkbox
-    weight: 6
+    weight: 5
     region: content
     settings:
       display_label: true
@@ -188,7 +187,7 @@ content:
     third_party_settings: {  }
   uid:
     type: entity_reference_autocomplete
-    weight: 2
+    weight: 1
     region: content
     settings:
       match_operator: CONTAINS

diff --git a/config/install/core.entity_form_display.node.localgov_publication_page.default.yml b/config/install/core.entity_form_display.node.localgov_publication_page.default.yml
@@ -2,13 +2,13 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.node.localgov_publication_page.localgov_page_content
+    - field.field.node.localgov_publication_page.localgov_publication_content
     - field.field.node.localgov_publication_page.localgov_published_date
     - field.field.node.localgov_publication_page.localgov_updated_date
     - node.type.localgov_publication_page
   module:
     - datetime
-    - paragraphs
+    - layout_paragraphs
     - path
 id: node.localgov_publication_page.default
 targetEntityType: node
@@ -17,79 +17,70 @@ mode: default
 content:
   created:
     type: datetime_timestamp
-    weight: 10
+    weight: 2
     region: content
     settings: {  }
     third_party_settings: {  }
-  localgov_page_content:
-    type: paragraphs
-    weight: 124
+  localgov_publication_content:
+    type: layout_paragraphs
+    weight: 3
     region: content
     settings:
-      title: Paragraph
-      title_plural: Paragraphs
-      edit_mode: open
-      closed_mode: summary
-      autocollapse: none
-      closed_mode_threshold: 0
-      add_mode: dropdown
-      form_display_mode: default
-      default_paragraph_type: localgov_text
-      features:
-        add_above: '0'
-        collapse_edit_all: collapse_edit_all
-        duplicate: duplicate
+      preview_view_mode: default
+      nesting_depth: 0
+      require_layouts: 0
+      empty_message: ''
     third_party_settings: {  }
   localgov_published_date:
     type: datetime_default
-    weight: 122
+    weight: 9
     region: content
     settings: {  }
     third_party_settings: {  }
   localgov_updated_date:
     type: datetime_default
-    weight: 123
+    weight: 10
     region: content
     settings: {  }
     third_party_settings: {  }
   path:
     type: path
-    weight: 30
+    weight: 7
     region: content
     settings: {  }
     third_party_settings: {  }
   promote:
     type: boolean_checkbox
-    weight: 15
+    weight: 5
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 120
+    weight: 8
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   sticky:
     type: boolean_checkbox
-    weight: 16
+    weight: 6
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   title:
     type: string_textfield
-    weight: -5
+    weight: 0
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
   uid:
     type: entity_reference_autocomplete
-    weight: 5
+    weight: 1
     region: content
     settings:
       match_operator: CONTAINS

diff --git a/config/install/core.entity_form_display.paragraph.localgov_publications_banner.default.yml b/config/install/core.entity_form_display.paragraph.localgov_publications_banner.default.yml
@@ -2,8 +2,8 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.paragraph.localgov_publications_banner.localgov_publications_text
     - field.field.paragraph.localgov_publications_banner.localgov_image
+    - field.field.paragraph.localgov_publications_banner.localgov_publications_text
     - field.field.paragraph.localgov_publications_banner.localgov_title
     - field.field.paragraph.localgov_publications_banner.localgov_url
     - paragraphs.paragraphs_type.localgov_publications_banner
@@ -15,14 +15,6 @@ targetEntityType: paragraph
 bundle: localgov_publications_banner
 mode: default
 content:
-  localgov_publications_text:
-    type: string_textarea
-    weight: 2
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
   localgov_image:
     type: media_library_widget
     weight: 0
@@ -32,6 +24,14 @@ content:
     third_party_settings:
       media_library_edit:
         show_edit: '1'
+  localgov_publications_text:
+    type: string_textarea
+    weight: 2
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
   localgov_title:
     type: string_textfield
     weight: 1

diff --git a/config/install/core.entity_view_display.node.localgov_publication_cover_page.default.yml b/config/install/core.entity_view_display.node.localgov_publication_cover_page.default.yml
@@ -2,16 +2,16 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.node.localgov_publication_cover_page.body
     - field.field.node.localgov_publication_cover_page.localgov_documents
     - field.field.node.localgov_publication_cover_page.localgov_publication
+    - field.field.node.localgov_publication_cover_page.localgov_publication_content
     - field.field.node.localgov_publication_cover_page.localgov_publications_banner
     - field.field.node.localgov_publication_cover_page.localgov_published_date
     - field.field.node.localgov_publication_cover_page.localgov_updated_date
     - node.type.localgov_publication_cover_page
   module:
+    - entity_reference_revisions
     - field_group
-    - text
     - user
 third_party_settings:
   field_group:
@@ -40,13 +40,6 @@ targetEntityType: node
 bundle: localgov_publication_cover_page
 mode: default
 content:
-  body:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 6
-    region: content
   content_moderation_control:
     settings: {  }
     third_party_settings: {  }
@@ -74,6 +67,15 @@ content:
     third_party_settings: {  }
     weight: 4
     region: content
+  localgov_publication_content:
+    type: entity_reference_revisions_entity_view
+    label: hidden
+    settings:
+      view_mode: default
+      link: ''
+    third_party_settings: {  }
+    weight: 4
+    region: content
 hidden:
   localgov_publications_banner: true
   localgov_published_date: true