before merging

config/sync/core.base_field_override.node.book.title.yml

@@ -1,14 +1,27 @@
+<<<<<<<< HEAD:config/sync/core.base_field_override.node.book.title.yml
 uuid: f0030e7d-aa55-4c47-81a3-83c8aef278c4
+========
+uuid: 197ac720-b1db-4a9c-85ae-9be04f706992
+>>>>>>>> detached:config/sync/core.base_field_override.node.static.title.yml
 langcode: fr
 status: true
 dependencies:
   config:
+<<<<<<<< HEAD:config/sync/core.base_field_override.node.book.title.yml
     - node.type.book
 id: node.book.title
 field_name: title
 entity_type: node
 bundle: book
 label: 'Titre de la partie'
+========
+    - node.type.static
+id: node.static.title
+field_name: title
+entity_type: node
+bundle: static
+label: Titre
+>>>>>>>> detached:config/sync/core.base_field_override.node.static.title.yml
 description: ''
 required: true
 translatable: true

config/sync/core.base_field_override.node.tableau.title.yml

@@ -1,18 +0,0 @@
-uuid: beca6a2b-0f07-4138-9e5c-56d842e3a306
-langcode: fr
-status: true
-dependencies:
-  config:
-    - node.type.tableau
-id: node.tableau.title
-field_name: title
-entity_type: node
-bundle: tableau
-label: 'Titre du tableau'
-description: ''
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string

config/sync/core.entity_form_display.node.book.default.yml

@@ -4,15 +4,25 @@ status: true
 dependencies:
   config:
     - field.field.node.book.body
+<<<<<<< HEAD
     - field.field.node.book.field_texte
     - node.type.book
   module:
     - field_group
+=======
+    - field.field.node.book.field_chapitre_2
+    - node.type.book
+  module:
+    - advanced_text_formatter
+    - field_group
+    - maxlength
+>>>>>>> detached
     - paragraphs
     - path
     - text
 third_party_settings:
   field_group:
+<<<<<<< HEAD
     group_new_chapitre:
       children:
         - field_texte
@@ -20,16 +30,63 @@ third_party_settings:
       region: content
       parent_name: ''
       weight: 12
+=======
+    group_tabs:
+      children:
+        - group_infos_partie
+        - group_contenu_de_la_partie
+      label: Tabs
+      region: content
+      parent_name: ''
+      weight: 11
+      format_type: tabs
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        direction: horizontal
+        width_breakpoint: 640
+    group_infos_partie:
+      children:
+        - langcode
+        - title
+        - body
+      label: 'Infos générales de la Partie'
+      region: content
+      parent_name: group_tabs
+      weight: 1
+>>>>>>> detached
       format_type: tab
       format_settings:
         classes: ''
         show_empty_fields: true
         id: ''
+<<<<<<< HEAD
         formatter: closed
         description: ''
         required_fields: true
         direction: vertical
         width_breakpoint: 640
+=======
+        formatter: open
+        description: ''
+        required_fields: true
+    group_contenu_de_la_partie:
+      children:
+        - field_chapitre_2
+      label: 'Contenu de la partie'
+      region: content
+      parent_name: group_tabs
+      weight: 3
+      format_type: tab
+      format_settings:
+        classes: ''
+        show_empty_fields: true
+        id: ''
+        formatter: open
+        description: ''
+        required_fields: true
+>>>>>>> detached
 _core:
   default_config_hash: b_hvlXsOoKPjlyIXXp3Msda_pMWTEC4kFo61--akj0Y
 id: node.book.default
@@ -39,7 +96,11 @@ mode: default
 content:
   body:
     type: text_textarea_with_summary
+<<<<<<< HEAD
     weight: 7
+=======
+    weight: 2
+>>>>>>> detached
     region: content
     settings:
       rows: 9
@@ -53,9 +114,15 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
+<<<<<<< HEAD
   field_texte:
     type: paragraphs
     weight: 11
+=======
+  field_chapitre_2:
+    type: paragraphs
+    weight: 2
+>>>>>>> detached
     region: content
     settings:
       title: Paragraphe
@@ -73,14 +140,22 @@ content:
     third_party_settings: {  }
   langcode:
     type: language_select
+<<<<<<< HEAD
     weight: 1
+=======
+    weight: 0
+>>>>>>> detached
     region: content
     settings:
       include_locked: true
     third_party_settings: {  }
   path:
     type: path
+<<<<<<< HEAD
     weight: 8
+=======
+    weight: 7
+>>>>>>> detached
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -93,7 +168,11 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
+<<<<<<< HEAD
     weight: 10
+=======
+    weight: 9
+>>>>>>> detached
     region: content
     settings:
       display_label: true
@@ -107,11 +186,26 @@ content:
     third_party_settings: {  }
   title:
     type: string_textfield
+<<<<<<< HEAD
     weight: 0
+=======
+    weight: 1
+>>>>>>> detached
     region: content
     settings:
       size: 60
       placeholder: ''
+    third_party_settings:
+      maxlength:
+        maxlength_js: null
+        maxlength_js_label: 'Contenu limité à @limit caractères, restant : <strong>@remaining</strong>'
+        maxlength_js_enforce: false
+      advanced_text_formatter:
+        show_token_tree: 0
+  translation:
+    weight: 4
+    region: content
+    settings: {  }
     third_party_settings: {  }
   translation:
     weight: 4
@@ -129,7 +223,11 @@ content:
       placeholder: ''
     third_party_settings: {  }
   url_redirects:
+<<<<<<< HEAD
     weight: 9
+=======
+    weight: 8
+>>>>>>> detached
     region: content
     settings: {  }
     third_party_settings: {  }

config/sync/core.entity_form_display.node.book_test_1.default.yml

@@ -4,8 +4,10 @@ status: true
 dependencies:
   config:
     - field.field.node.book_test_1.body
+    - field.field.node.book_test_1.field_lien_sommaire
     - node.type.book_test_1
   module:
+    - link
     - path
     - text
 id: node.book_test_1.default
@@ -29,6 +31,14 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
+  field_lien_sommaire:
+    type: link_default
+    weight: 122
+    region: content
+    settings:
+      placeholder_url: ''
+      placeholder_title: ''
+    third_party_settings: {  }
   langcode:
     type: language_select
     weight: 2
@@ -71,6 +81,11 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  translation:
+    weight: 10
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   uid:
     type: entity_reference_autocomplete
     weight: 5

config/sync/core.entity_form_display.node.chapter.default.yml

@@ -1,98 +0,0 @@
-uuid: b5ddee05-f3f3-4ed5-bee3-7ed65823d1ce
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.node.chapter.body
-    - field.field.node.chapter.field_title
-    - node.type.chapter
-  module:
-    - path
-    - text
-id: node.chapter.default
-targetEntityType: node
-bundle: chapter
-mode: default
-content:
-  body:
-    type: text_textarea_with_summary
-    weight: 121
-    region: content
-    settings:
-      rows: 9
-      summary_rows: 3
-      placeholder: ''
-      show_summary: false
-    third_party_settings: {  }
-  created:
-    type: datetime_timestamp
-    weight: 10
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_title:
-    type: text_textarea
-    weight: 122
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  promote:
-    type: boolean_checkbox
-    weight: 15
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 120
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  sticky:
-    type: boolean_checkbox
-    weight: 16
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  title:
-    type: string_textfield
-    weight: -5
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  uid:
-    type: entity_reference_autocomplete
-    weight: 5
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  url_redirects:
-    weight: 50
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden: {  }

config/sync/core.entity_form_display.paragraph.image.default.yml

@@ -1,9 +1,18 @@
+<<<<<<< HEAD
 uuid: d9a243c9-25f2-4fca-b7f8-a227cd333f1d
 langcode: fr
 status: true
 dependencies:
   config:
     - field.field.paragraph.image.field_image
+=======
+uuid: 75a2cd22-d356-49f0-bd56-18068f0268bb
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.image.field_paragraph_image_
+>>>>>>> detached
     - image.style.thumbnail
     - paragraphs.paragraphs_type.image
   module:
@@ -13,7 +22,11 @@ targetEntityType: paragraph
 bundle: image
 mode: default
 content:
+<<<<<<< HEAD
   field_image:
+=======
+  field_paragraph_image_:
+>>>>>>> detached
     type: image_image
     weight: 0
     region: content

config/sync/core.entity_form_display.paragraph.paragraph_chapitre.default.yml

@@ -0,0 +1,36 @@
+uuid: 2cd91a90-ea34-41cb-ae14-3ee04074b689
+langcode: fr
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.paragraph_chapitre.field_nv_chapitre
+    - paragraphs.paragraphs_type.paragraph_chapitre
+  module:
+    - paragraphs
+id: paragraph.paragraph_chapitre.default
+targetEntityType: paragraph
+bundle: paragraph_chapitre
+mode: default
+content:
+  field_nv_chapitre:
+    type: paragraphs
+    weight: 0
+    region: content
+    settings:
+      title: Paragraphe
+      title_plural: Paragraphs
+      edit_mode: closed_expand_nested
+      closed_mode: summary
+      autocollapse: none
+      closed_mode_threshold: 0
+      add_mode: button
+      form_display_mode: default
+      default_paragraph_type: titre_de_chapitre
+      features:
+        add_above: '0'
+        collapse_edit_all: collapse_edit_all
+        duplicate: duplicate
+    third_party_settings: {  }
+hidden:
+  created: true
+  status: true

config/sync/core.entity_form_display.paragraph.sous_titre.default.yml

@@ -0,0 +1,25 @@
+uuid: b6baf8f2-9234-45a9-9146-e9982a5ffa91
+langcode: fr
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.sous_titre.field_sous_titre
+    - paragraphs.paragraphs_type.sous_titre
+  module:
+    - text
+id: paragraph.sous_titre.default
+targetEntityType: paragraph
+bundle: sous_titre
+mode: default
+content:
+  field_sous_titre:
+    type: text_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  created: true
+  status: true

config/sync/core.entity_form_display.paragraph.tableau.default.yml

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 uuid: 9b6a5ca5-3f6d-49eb-b456-e6b03eb2bfac
+=======
+uuid: cf620d35-07ff-4677-aa9c-5d3625393cf5
+>>>>>>> detached
 langcode: fr
 status: true
 dependencies:
@@ -6,13 +10,18 @@ dependencies:
     - field.field.paragraph.tableau.field_tableau
     - paragraphs.paragraphs_type.tableau
   module:
+<<<<<<< HEAD
     - entity_reference_revisions
+=======
+    - tablefield
+>>>>>>> detached
 id: paragraph.tableau.default
 targetEntityType: paragraph
 bundle: tableau
 mode: default
 content:
   field_tableau:
+<<<<<<< HEAD
     type: entity_reference_revisions_autocomplete
     weight: 0
     region: content
@@ -21,6 +30,13 @@ content:
       match_limit: 10
       size: 60
       placeholder: ''
+=======
+    type: tablefield
+    weight: 0
+    region: content
+    settings:
+      input_type: textfield
+>>>>>>> detached
     third_party_settings: {  }
 hidden:
   created: true

config/sync/core.entity_form_display.paragraph.texte.default.yml

@@ -1,9 +1,17 @@
+<<<<<<< HEAD
 uuid: a7c00538-4db7-4a79-8e9a-6861b7f435f9
+=======
+uuid: 290c957d-6267-4960-9ef6-9e4d4724c1b7
+>>>>>>> detached
 langcode: fr
 status: true
 dependencies:
   config:
+<<<<<<< HEAD
     - field.field.paragraph.texte.field_texte_long
+=======
+    - field.field.paragraph.texte.field_texte
+>>>>>>> detached
     - paragraphs.paragraphs_type.texte
   module:
     - text
@@ -12,7 +20,11 @@ targetEntityType: paragraph
 bundle: texte
 mode: default
 content:
+<<<<<<< HEAD
   field_texte_long:
+=======
+  field_texte:
+>>>>>>> detached
     type: text_textarea
     weight: 0
     region: content

config/sync/core.entity_form_display.paragraph.titre_de_chapitre.default.yml

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 uuid: b61299f2-b8de-4633-9142-48afe65e43d6
+=======
+uuid: ccbc025e-5c38-4dd9-98a2-c848cedaa5b4
+>>>>>>> detached
 langcode: fr
 status: true
 dependencies:

config/sync/core.entity_view_display.node.book.default.yml

@@ -4,7 +4,11 @@ status: true
 dependencies:
   config:
     - field.field.node.book.body
+<<<<<<< HEAD
     - field.field.node.book.field_texte
+=======
+    - field.field.node.book.field_chapitre_2
+>>>>>>> detached
     - node.type.book
   module:
     - entity_reference_revisions
@@ -24,14 +28,22 @@ content:
     third_party_settings: {  }
     weight: 100
     region: content
+<<<<<<< HEAD
   field_texte:
+=======
+  field_chapitre_2:
+>>>>>>> detached
     type: entity_reference_revisions_entity_view
     label: above
     settings:
       view_mode: default
       link: ''
     third_party_settings: {  }
+<<<<<<< HEAD
     weight: 103
+=======
+    weight: 102
+>>>>>>> detached
     region: content
   links:
     weight: 101

config/sync/core.entity_view_display.node.book.teaser.yml

@@ -5,7 +5,11 @@ dependencies:
   config:
     - core.entity_view_mode.node.teaser
     - field.field.node.book.body
+<<<<<<< HEAD
     - field.field.node.book.field_texte
+=======
+    - field.field.node.book.field_chapitre_2
+>>>>>>> detached
     - node.type.book
   module:
     - text
@@ -29,6 +33,10 @@ content:
     weight: 101
     region: content
 hidden:
+<<<<<<< HEAD
   field_texte: true
+=======
+  field_chapitre_2: true
+>>>>>>> detached
   langcode: true
   search_api_excerpt: true

config/sync/core.entity_view_display.node.book_test_1.default.yml

@@ -4,8 +4,10 @@ status: true
 dependencies:
   config:
     - field.field.node.book_test_1.body
+    - field.field.node.book_test_1.field_lien_sommaire
     - node.type.book_test_1
   module:
+    - link
     - text
     - user
 id: node.book_test_1.default
@@ -20,6 +22,18 @@ content:
     third_party_settings: {  }
     weight: 101
     region: content
+  field_lien_sommaire:
+    type: link
+    label: above
+    settings:
+      trim_length: 80
+      url_only: false
+      url_plain: false
+      rel: ''
+      target: ''
+    third_party_settings: {  }
+    weight: 102
+    region: content
   links:
     settings: {  }
     third_party_settings: {  }

config/sync/core.entity_view_display.node.book_test_1.teaser.yml

@@ -5,6 +5,7 @@ dependencies:
   config:
     - core.entity_view_mode.node.teaser
     - field.field.node.book_test_1.body
+    - field.field.node.book_test_1.field_lien_sommaire
     - node.type.book_test_1
   module:
     - text
@@ -28,5 +29,6 @@ content:
     weight: 100
     region: content
 hidden:
+  field_lien_sommaire: true
   langcode: true
   search_api_excerpt: true

config/sync/core.entity_view_display.node.chapter.default.yml

@@ -1,38 +0,0 @@
-uuid: ed2ea658-3f5e-4259-b26e-7ffcaae99d8a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.node.chapter.body
-    - field.field.node.chapter.field_title
-    - node.type.chapter
-  module:
-    - text
-    - user
-id: node.chapter.default
-targetEntityType: node
-bundle: chapter
-mode: default
-content:
-  body:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 101
-    region: content
-  field_title:
-    type: text_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 102
-    region: content
-  links:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 100
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true

config/sync/core.entity_view_display.node.chapter.teaser.yml

@@ -1,34 +0,0 @@
-uuid: fd1724fa-a0b5-49cf-b36f-4a8154f54309
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.node.teaser
-    - field.field.node.chapter.body
-    - field.field.node.chapter.field_title
-    - node.type.chapter
-  module:
-    - text
-    - user
-id: node.chapter.teaser
-targetEntityType: node
-bundle: chapter
-mode: teaser
-content:
-  body:
-    type: text_summary_or_trimmed
-    label: hidden
-    settings:
-      trim_length: 600
-    third_party_settings: {  }
-    weight: 101
-    region: content
-  links:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 100
-    region: content
-hidden:
-  field_title: true
-  langcode: true
-  search_api_excerpt: true

config/sync/core.entity_view_display.paragraph.image.default.yml

@@ -1,9 +1,18 @@
+<<<<<<< HEAD
 uuid: 9b71bce9-4a8c-4c42-9309-e0e93fa013d4
 langcode: fr
 status: true
 dependencies:
   config:
     - field.field.paragraph.image.field_image
+=======
+uuid: 02f9559f-bbab-437d-b69c-28a2c8155967
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.image.field_paragraph_image_
+>>>>>>> detached
     - paragraphs.paragraphs_type.image
   module:
     - image
@@ -12,7 +21,11 @@ targetEntityType: paragraph
 bundle: image
 mode: default
 content:
+<<<<<<< HEAD
   field_image:
+=======
+  field_paragraph_image_:
+>>>>>>> detached
     type: image
     label: above
     settings:

config/sync/core.entity_view_display.paragraph.paragraph_chapitre.default.yml

@@ -0,0 +1,25 @@
+uuid: fde8c5af-f4a2-4490-abf5-52a2bc1fb745
+langcode: fr
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.paragraph_chapitre.field_nv_chapitre
+    - paragraphs.paragraphs_type.paragraph_chapitre
+  module:
+    - entity_reference_revisions
+id: paragraph.paragraph_chapitre.default
+targetEntityType: paragraph
+bundle: paragraph_chapitre
+mode: default
+content:
+  field_nv_chapitre:
+    type: entity_reference_revisions_entity_view
+    label: above
+    settings:
+      view_mode: default
+      link: ''
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  search_api_excerpt: true

config/sync/core.entity_view_display.paragraph.sous_titre.default.yml

@@ -0,0 +1,23 @@
+uuid: e8d6401a-c6dc-467d-8e57-300bde3a7e2f
+langcode: fr
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.sous_titre.field_sous_titre
+    - paragraphs.paragraphs_type.sous_titre
+  module:
+    - text
+id: paragraph.sous_titre.default
+targetEntityType: paragraph
+bundle: sous_titre
+mode: default
+content:
+  field_sous_titre:
+    type: text_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  search_api_excerpt: true

config/sync/core.entity_view_display.paragraph.tableau.default.yml

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 uuid: c230c56b-6e1e-4968-9725-bbf5c4d88183
+=======
+uuid: df6a9695-f33a-4d73-bdcc-70a8dcbdf296
+>>>>>>> detached
 langcode: fr
 status: true
 dependencies:
@@ -6,18 +10,30 @@ dependencies:
     - field.field.paragraph.tableau.field_tableau
     - paragraphs.paragraphs_type.tableau
   module:
+<<<<<<< HEAD
     - entity_reference_revisions
+=======
+    - tablefield
+>>>>>>> detached
 id: paragraph.tableau.default
 targetEntityType: paragraph
 bundle: tableau
 mode: default
 content:
   field_tableau:
+<<<<<<< HEAD
     type: entity_reference_revisions_entity_view
     label: above
     settings:
       view_mode: default
       link: ''
+=======
+    type: tablefield
+    label: above
+    settings:
+      row_header: true
+      column_header: false
+>>>>>>> detached
     third_party_settings: {  }
     weight: 0
     region: content

config/sync/core.entity_view_display.paragraph.texte.default.yml

@@ -1,9 +1,17 @@
+<<<<<<< HEAD
 uuid: aa1fbe68-8635-4380-b469-5e83437b7278
+=======
+uuid: 7d864fb0-66ab-4d88-8309-9f930192b232
+>>>>>>> detached
 langcode: fr
 status: true
 dependencies:
   config:
+<<<<<<< HEAD
     - field.field.paragraph.texte.field_texte_long
+=======
+    - field.field.paragraph.texte.field_texte
+>>>>>>> detached
     - paragraphs.paragraphs_type.texte
   module:
     - text
@@ -12,7 +20,11 @@ targetEntityType: paragraph
 bundle: texte
 mode: default
 content:
+<<<<<<< HEAD
   field_texte_long:
+=======
+  field_texte:
+>>>>>>> detached
     type: text_default
     label: above
     settings: {  }

config/sync/core.entity_view_display.paragraph.titre_de_chapitre.default.yml

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 uuid: 4193668d-40f5-4720-af5a-7581bf461ce2
+=======
+uuid: 75122506-71f3-430e-a1c3-3f4bfbbe03e9
+>>>>>>> detached
 langcode: fr
 status: true
 dependencies:

config/sync/core.entity_view_display.paragraph.titre_de_chapitre.texte_toc.yml

@@ -0,0 +1,51 @@
+uuid: c5543a8c-98a0-4528-af89-e77ea364ae27
+langcode: fr
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.paragraph.texte_toc
+    - field.field.paragraph.titre_de_chapitre.field_titre_du_chapitre
+    - paragraphs.paragraphs_type.titre_de_chapitre
+  module:
+    - layout_builder
+    - text
+third_party_settings:
+  layout_builder:
+    enabled: true
+    allow_custom: false
+    sections:
+      -
+        layout_id: layout_onecol
+        layout_settings:
+          label: ''
+        components:
+          4486c3e6-a451-4321-ab11-fc0dc3d8a5e9:
+            uuid: 4486c3e6-a451-4321-ab11-fc0dc3d8a5e9
+            region: content
+            configuration:
+              id: 'field_block:paragraph:titre_de_chapitre:field_titre_du_chapitre'
+              label_display: '0'
+              context_mapping:
+                entity: layout_builder.entity
+              formatter:
+                type: text_default
+                label: above
+                settings: {  }
+                third_party_settings: {  }
+            weight: 0
+            additional: {  }
+        third_party_settings: {  }
+id: paragraph.titre_de_chapitre.texte_toc
+targetEntityType: paragraph
+bundle: titre_de_chapitre
+mode: texte_toc
+content:
+  field_titre_du_chapitre:
+    type: text_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  search_api_excerpt: true

config/sync/core.entity_view_mode.paragraph.texte_toc.yml

@@ -0,0 +1,10 @@
+uuid: e9305a59-7d8d-4400-b96e-f7b250136de8
+langcode: fr
+status: true
+dependencies:
+  module:
+    - paragraphs
+id: paragraph.texte_toc
+label: 'textes TOC'
+targetEntityType: paragraph
+cache: true

config/sync/field.field.node.book.body.yml

@@ -13,7 +13,7 @@ id: node.book.body
 field_name: body
 entity_type: node
 bundle: book
-label: Corps
+label: 'texte introductif '
 description: ''
 required: false
 translatable: true

config/sync/field.field.node.book.field_chapitre_2.yml

@@ -0,0 +1,46 @@
+uuid: d12c5457-9f3a-4ded-9dc7-6cd5fee292a8
+langcode: fr
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_chapitre_2
+    - node.type.book
+    - paragraphs.paragraphs_type.paragraph_chapitre
+  module:
+    - entity_reference_revisions
+id: node.book.field_chapitre_2
+field_name: field_chapitre_2
+entity_type: node
+bundle: book
+label: Chapitres
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:paragraph'
+  handler_settings:
+    target_bundles:
+      paragraph_chapitre: paragraph_chapitre
+    negate: 0
+    target_bundles_drag_drop:
+      image:
+        weight: 9
+        enabled: false
+      paragraph_chapitre:
+        weight: 10
+        enabled: true
+      sous_titre:
+        weight: 11
+        enabled: false
+      tableau:
+        weight: 12
+        enabled: false
+      texte:
+        weight: 13
+        enabled: false
+      titre_de_chapitre:
+        weight: 14
+        enabled: false
+field_type: entity_reference_revisions

config/sync/field.field.node.book_test_1.field_lien_sommaire.yml

@@ -0,0 +1,23 @@
+uuid: d4c4aa96-a544-4dc0-9cde-79f13d9654d4
+langcode: fr
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_lien_sommaire
+    - node.type.book_test_1
+  module:
+    - link
+id: node.book_test_1.field_lien_sommaire
+field_name: field_lien_sommaire
+entity_type: node
+bundle: book_test_1
+label: 'lien sommaire'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  title: 1
+  link_type: 1
+field_type: link

config/sync/field.field.node.chapter.field_title.yml

@@ -1,21 +0,0 @@
-uuid: dc890759-1fca-4644-b5f9-f17c49823cd0
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_title
-    - node.type.chapter
-  module:
-    - text
-id: node.chapter.field_title
-field_name: field_title
-entity_type: node
-bundle: chapter
-label: Title
-description: 'titre du chapitre'
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: text_long

config/sync/field.field.node.tableau.body.yml

@@ -1,23 +0,0 @@
-uuid: 92f68599-4c06-4d7c-97d0-3fcde8f11268
-langcode: fr
-status: true
-dependencies:
-  config:
-    - field.storage.node.body
-    - node.type.tableau
-  module:
-    - text
-id: node.tableau.body
-field_name: body
-entity_type: node
-bundle: tableau
-label: Body
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  display_summary: true
-  required_summary: false
-field_type: text_with_summary

config/sync/field.field.paragraph.image.field_image.yml

@@ -1,3 +1,4 @@
+<<<<<<<< HEAD:config/sync/field.field.paragraph.image.field_image.yml
 uuid: 40433c68-1d72-4a68-9478-41bcbcc44bf6
 langcode: fr
 status: true
@@ -12,6 +13,22 @@ field_name: field_image
 entity_type: paragraph
 bundle: image
 label: image
+========
+uuid: 0a0c567f-be14-4fc0-a7d2-65ab494f5740
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_paragraph_image_
+    - paragraphs.paragraphs_type.image
+  module:
+    - image
+id: paragraph.image.field_paragraph_image_
+field_name: field_paragraph_image_
+entity_type: paragraph
+bundle: image
+label: 'paragraph Image '
+>>>>>>>> detached:config/sync/field.field.paragraph.image.field_paragraph_image_.yml
 description: ''
 required: false
 translatable: false

config/sync/field.field.paragraph.image.field_paragraph_image_.yml

@@ -0,0 +1,55 @@
+<<<<<<<< HEAD:config/sync/field.field.paragraph.image.field_image.yml
+uuid: 40433c68-1d72-4a68-9478-41bcbcc44bf6
+langcode: fr
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_image
+    - paragraphs.paragraphs_type.image
+  module:
+    - image
+id: paragraph.image.field_image
+field_name: field_image
+entity_type: paragraph
+bundle: image
+label: image
+========
+uuid: 0a0c567f-be14-4fc0-a7d2-65ab494f5740
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_paragraph_image_
+    - paragraphs.paragraphs_type.image
+  module:
+    - image
+id: paragraph.image.field_paragraph_image_
+field_name: field_paragraph_image_
+entity_type: paragraph
+bundle: image
+label: 'paragraph Image '
+>>>>>>>> detached:config/sync/field.field.paragraph.image.field_paragraph_image_.yml
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:file'
+  handler_settings: {  }
+  file_directory: '[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'png gif jpg jpeg'
+  max_filesize: ''
+  max_resolution: ''
+  min_resolution: ''
+  alt_field: true
+  alt_field_required: true
+  title_field: true
+  title_field_required: true
+  default_image:
+    uuid: ''
+    alt: ''
+    title: ''
+    width: null
+    height: null
+field_type: image

config/sync/field.field.paragraph.paragraph_chapitre.field_nv_chapitre.yml

@@ -0,0 +1,57 @@
+uuid: 8dbe6b18-988f-4727-82e3-b0c42748dbeb
+langcode: fr
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_nv_chapitre
+    - paragraphs.paragraphs_type.image
+    - paragraphs.paragraphs_type.paragraph_chapitre
+    - paragraphs.paragraphs_type.sous_titre
+    - paragraphs.paragraphs_type.tableau
+    - paragraphs.paragraphs_type.texte
+    - paragraphs.paragraphs_type.titre_de_chapitre
+  module:
+    - entity_reference_revisions
+id: paragraph.paragraph_chapitre.field_nv_chapitre
+field_name: field_nv_chapitre
+entity_type: paragraph
+bundle: paragraph_chapitre
+label: 'nv chapitre'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:paragraph'
+  handler_settings:
+    target_bundles:
+      image: image
+      sous_titre: sous_titre
+      tableau: tableau
+      texte: texte
+      titre_de_chapitre: titre_de_chapitre
+    negate: 0
+    target_bundles_drag_drop:
+      chapitre:
+        weight: 9
+        enabled: false
+      image:
+        weight: 10
+        enabled: true
+      paragraph_chapitre:
+        weight: 8
+        enabled: false
+      sous_titre:
+        weight: 11
+        enabled: true
+      tableau:
+        weight: 12
+        enabled: true
+      texte:
+        weight: 13
+        enabled: true
+      titre_de_chapitre:
+        weight: 14
+        enabled: true
+field_type: entity_reference_revisions

config/sync/field.field.paragraph.sous_titre.field_sous_titre.yml

@@ -0,0 +1,21 @@
+uuid: 489a77c5-0f96-4890-8106-339c7b1e4a4c
+langcode: fr
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_sous_titre
+    - paragraphs.paragraphs_type.sous_titre
+  module:
+    - text
+id: paragraph.sous_titre.field_sous_titre
+field_name: field_sous_titre
+entity_type: paragraph
+bundle: sous_titre
+label: 'sous titre'
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: text

config/sync/field.field.paragraph.tableau.field_tableau.yml

@@ -1,17 +1,34 @@
+<<<<<<< HEAD
 uuid: c11fa909-55cc-4306-9219-20931b3662bb
+=======
+uuid: f4a0a93d-ddda-4687-ac7f-f464a0f91a19
+>>>>>>> detached
 langcode: fr
 status: true
 dependencies:
   config:
     - field.storage.paragraph.field_tableau
+<<<<<<< HEAD
     - node.type.book
     - paragraphs.paragraphs_type.tableau
   module:
     - entity_reference_revisions
+=======
+    - paragraphs.paragraphs_type.tableau
+  module:
+    - tablefield
+    - tablefield_required
+third_party_settings:
+  tablefield_required:
+    required_rows: ''
+    required_cols: ''
+    multivalue_inherit: false
+>>>>>>> detached
 id: paragraph.tableau.field_tableau
 field_name: field_tableau
 entity_type: paragraph
 bundle: tableau
+<<<<<<< HEAD
 label: Tableau
 description: ''
 required: false
@@ -29,3 +46,107 @@ settings:
     auto_create: false
     auto_create_bundle: ''
 field_type: entity_reference_revisions
+=======
+label: tableau
+description: ''
+required: false
+translatable: true
+default_value:
+  -
+    rebuild:
+      cols: '5'
+      rows: '5'
+    value:
+      0:
+        weight: '0'
+        0: ''
+        1: ''
+        2: ''
+        3: ''
+        4: ''
+      1:
+        weight: '1'
+        0: ''
+        1: ''
+        2: ''
+        3: ''
+        4: ''
+      2:
+        weight: '2'
+        0: ''
+        1: ''
+        2: ''
+        3: ''
+        4: ''
+      3:
+        weight: '3'
+        0: ''
+        1: ''
+        2: ''
+        3: ''
+        4: ''
+      4:
+        weight: '4'
+        0: ''
+        1: ''
+        2: ''
+        3: ''
+        4: ''
+      caption: ''
+    format: null
+    caption: ''
+  -
+    rebuild:
+      cols: '5'
+      rows: '5'
+    value:
+      0:
+        weight: '0'
+        0: ''
+        1: ''
+        2: ''
+        3: ''
+        4: ''
+      1:
+        weight: '1'
+        0: ''
+        1: ''
+        2: ''
+        3: ''
+        4: ''
+      2:
+        weight: '2'
+        0: ''
+        1: ''
+        2: ''
+        3: ''
+        4: ''
+      3:
+        weight: '3'
+        0: ''
+        1: ''
+        2: ''
+        3: ''
+        4: ''
+      4:
+        weight: '4'
+        0: ''
+        1: ''
+        2: ''
+        3: ''
+        4: ''
+      caption: ''
+    format: null
+    caption: ''
+default_value_callback: ''
+settings:
+  export: false
+  restrict_rebuild: true
+  restrict_import: true
+  lock_values: false
+  cell_processing: 0
+  empty_rules:
+    ignore_table_structure: false
+    ignore_table_header: false
+field_type: tablefield
+>>>>>>> detached

config/sync/field.field.paragraph.texte.field_texte.yml

@@ -0,0 +1,21 @@
+uuid: 26e6abad-4e0a-4715-b10d-900abf4d6b8a
+langcode: fr
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_texte
+    - paragraphs.paragraphs_type.texte
+  module:
+    - text
+id: paragraph.texte.field_texte
+field_name: field_texte
+entity_type: paragraph
+bundle: texte
+label: texte
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: text_long

config/sync/field.field.paragraph.titre_de_chapitre.field_titre_du_chapitre.yml

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 uuid: 9f65141b-47ab-4234-a733-da47e20ba5b9
+=======
+uuid: eb12d60b-1a44-4c35-8a3a-15b22eee0c3d
+>>>>>>> detached
 langcode: fr
 status: true
 dependencies:
@@ -13,8 +17,13 @@ entity_type: paragraph
 bundle: titre_de_chapitre
 label: 'Titre du chapitre'
 description: ''
+<<<<<<< HEAD
 required: true
 translatable: false
+=======
+required: false
+translatable: true
+>>>>>>> detached
 default_value: {  }
 default_value_callback: ''
 settings: {  }

config/sync/field.storage.node.field_chapitre_2.yml

@@ -0,0 +1,30 @@
+<<<<<<<< HEAD:config/sync/field.storage.node.field_texte.yml
+uuid: 7bc5005b-8923-42cb-8b21-7ab2dc91406d
+========
+uuid: feb4dba7-f43c-40ee-875c-e8f662eee38d
+>>>>>>>> detached:config/sync/field.storage.node.field_chapitre_2.yml
+langcode: fr
+status: true
+dependencies:
+  module:
+    - entity_reference_revisions
+    - node
+    - paragraphs
+<<<<<<<< HEAD:config/sync/field.storage.node.field_texte.yml
+id: node.field_texte
+field_name: field_texte
+========
+id: node.field_chapitre_2
+field_name: field_chapitre_2
+>>>>>>>> detached:config/sync/field.storage.node.field_chapitre_2.yml
+entity_type: node
+type: entity_reference_revisions
+settings:
+  target_type: paragraph
+module: entity_reference_revisions
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

config/sync/field.storage.node.field_title.yml → config/sync/field.storage.node.field_lien_sommaire.yml

@@ -1,18 +1,18 @@
-uuid: 9570a865-1c77-4949-9e62-7babd2ac9fbe
-langcode: en
+uuid: 488d1abf-6b21-40e4-8ec6-dcd24af005e3
+langcode: fr
 status: true
 dependencies:
   module:
+    - link
     - node
-    - text
-id: node.field_title
-field_name: field_title
+id: node.field_lien_sommaire
+field_name: field_lien_sommaire
 entity_type: node
-type: text_long
+type: link
 settings: {  }
-module: text
+module: link
 locked: false
-cardinality: 1
+cardinality: -1
 translatable: true
 indexes: {  }
 persist_with_no_fields: false

config/sync/field.storage.node.field_texte.yml

@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:config/sync/field.storage.node.field_texte.yml
 uuid: 7bc5005b-8923-42cb-8b21-7ab2dc91406d
+========
+uuid: feb4dba7-f43c-40ee-875c-e8f662eee38d
+>>>>>>>> detached:config/sync/field.storage.node.field_chapitre_2.yml
 langcode: fr
 status: true
 dependencies:
@@ -6,8 +10,13 @@ dependencies:
     - entity_reference_revisions
     - node
     - paragraphs
+<<<<<<<< HEAD:config/sync/field.storage.node.field_texte.yml
 id: node.field_texte
 field_name: field_texte
+========
+id: node.field_chapitre_2
+field_name: field_chapitre_2
+>>>>>>>> detached:config/sync/field.storage.node.field_chapitre_2.yml
 entity_type: node
 type: entity_reference_revisions
 settings:

config/sync/field.storage.node.field_titre.yml

@@ -1,15 +1,28 @@
+<<<<<<<< HEAD:config/sync/field.storage.node.field_titre.yml
 uuid: f1660af9-ffbe-42b0-a677-3600f8a6c21a
+========
+uuid: 7bc82f4c-f8ce-4858-8f11-59af6fede242
+>>>>>>>> detached:config/sync/field.storage.paragraph.field_sous_titre.yml
 langcode: fr
 status: true
 dependencies:
   module:
     - node
     - text
+<<<<<<<< HEAD:config/sync/field.storage.node.field_titre.yml
 id: node.field_titre
 field_name: field_titre
 entity_type: node
 type: text_long
 settings: {  }
+========
+id: paragraph.field_sous_titre
+field_name: field_sous_titre
+entity_type: paragraph
+type: text
+settings:
+  max_length: 255
+>>>>>>>> detached:config/sync/field.storage.paragraph.field_sous_titre.yml
 module: text
 locked: false
 cardinality: 1

config/sync/field.storage.paragraph.field_nv_chapitre.yml

@@ -0,0 +1,20 @@
+uuid: 61581c8d-24e6-4e46-8b73-d5bd5a2c1490
+langcode: fr
+status: true
+dependencies:
+  module:
+    - entity_reference_revisions
+    - paragraphs
+id: paragraph.field_nv_chapitre
+field_name: field_nv_chapitre
+entity_type: paragraph
+type: entity_reference_revisions
+settings:
+  target_type: paragraph
+module: entity_reference_revisions
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

config/sync/field.storage.paragraph.field_paragraph_image_.yml

@@ -0,0 +1,30 @@
+uuid: 70754ded-e090-4279-a605-7b66a9b4f658
+langcode: en
+status: true
+dependencies:
+  module:
+    - file
+    - image
+    - paragraphs
+id: paragraph.field_paragraph_image_
+field_name: field_paragraph_image_
+entity_type: paragraph
+type: image
+settings:
+  target_type: file
+  display_field: false
+  display_default: false
+  uri_scheme: public
+  default_image:
+    uuid: ''
+    alt: ''
+    title: ''
+    width: null
+    height: null
+module: image
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

config/sync/field.storage.paragraph.field_sous_titre.yml

@@ -0,0 +1,32 @@
+<<<<<<<< HEAD:config/sync/field.storage.node.field_titre.yml
+uuid: f1660af9-ffbe-42b0-a677-3600f8a6c21a
+========
+uuid: 7bc82f4c-f8ce-4858-8f11-59af6fede242
+>>>>>>>> detached:config/sync/field.storage.paragraph.field_sous_titre.yml
+langcode: fr
+status: true
+dependencies:
+  module:
+    - node
+    - text
+<<<<<<<< HEAD:config/sync/field.storage.node.field_titre.yml
+id: node.field_titre
+field_name: field_titre
+entity_type: node
+type: text_long
+settings: {  }
+========
+id: paragraph.field_sous_titre
+field_name: field_sous_titre
+entity_type: paragraph
+type: text
+settings:
+  max_length: 255
+>>>>>>>> detached:config/sync/field.storage.paragraph.field_sous_titre.yml
+module: text
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

config/sync/field.storage.paragraph.field_tableau.yml

@@ -1,8 +1,17 @@
+<<<<<<< HEAD
 uuid: 903ce88d-f47a-447d-ad6e-b2e511baafe1
+=======
+<<<<<<<< HEAD:config/sync/field.storage.paragraph.field_titre_du_chapitre.yml
+uuid: 25394f58-6e89-4912-b1de-e2d73ee54b2c
+========
+uuid: e2e5d683-8d2d-4e51-827b-4520ee09464e
+>>>>>>>> detached:config/sync/field.storage.paragraph.field_tableau.yml
+>>>>>>> detached
 langcode: fr
 status: true
 dependencies:
   module:
+<<<<<<< HEAD
     - entity_reference_revisions
     - node
     - paragraphs
@@ -13,6 +22,27 @@ type: entity_reference_revisions
 settings:
   target_type: node
 module: entity_reference_revisions
+=======
+    - paragraphs
+<<<<<<<< HEAD:config/sync/field.storage.paragraph.field_titre_du_chapitre.yml
+    - text
+id: paragraph.field_titre_du_chapitre
+field_name: field_titre_du_chapitre
+entity_type: paragraph
+type: text
+settings:
+  max_length: 255
+module: text
+========
+    - tablefield
+id: paragraph.field_tableau
+field_name: field_tableau
+entity_type: paragraph
+type: tablefield
+settings: {  }
+module: tablefield
+>>>>>>>> detached:config/sync/field.storage.paragraph.field_tableau.yml
+>>>>>>> detached
 locked: false
 cardinality: 1
 translatable: true

config/sync/field.storage.paragraph.field_texte.yml

@@ -0,0 +1,28 @@
+<<<<<<<< HEAD:config/sync/field.storage.paragraph.field_texte_long.yml
+uuid: 028f6d7e-8482-4fe7-af08-ee704dc26139
+========
+uuid: b608f3dd-6f2e-4e71-8045-3adfceaeba14
+>>>>>>>> detached:config/sync/field.storage.paragraph.field_texte.yml
+langcode: fr
+status: true
+dependencies:
+  module:
+    - paragraphs
+    - text
+<<<<<<<< HEAD:config/sync/field.storage.paragraph.field_texte_long.yml
+id: paragraph.field_texte_long
+field_name: field_texte_long
+========
+id: paragraph.field_texte
+field_name: field_texte
+>>>>>>>> detached:config/sync/field.storage.paragraph.field_texte.yml
+entity_type: paragraph
+type: text_long
+settings: {  }
+module: text
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

config/sync/field.storage.paragraph.field_texte_long.yml

@@ -1,18 +1,27 @@
+<<<<<<<< HEAD:config/sync/field.storage.paragraph.field_texte_long.yml
 uuid: 028f6d7e-8482-4fe7-af08-ee704dc26139
+========
+uuid: b608f3dd-6f2e-4e71-8045-3adfceaeba14
+>>>>>>>> detached:config/sync/field.storage.paragraph.field_texte.yml
 langcode: fr
 status: true
 dependencies:
   module:
     - paragraphs
     - text
+<<<<<<<< HEAD:config/sync/field.storage.paragraph.field_texte_long.yml
 id: paragraph.field_texte_long
 field_name: field_texte_long
+========
+id: paragraph.field_texte
+field_name: field_texte
+>>>>>>>> detached:config/sync/field.storage.paragraph.field_texte.yml
 entity_type: paragraph
 type: text_long
 settings: {  }
 module: text
 locked: false
-cardinality: 1
+cardinality: -1
 translatable: true
 indexes: {  }
 persist_with_no_fields: false

config/sync/field.storage.paragraph.field_titre_du_chapitre.yml

@@ -1,9 +1,21 @@
+<<<<<<< HEAD
+<<<<<<<< HEAD:config/sync/field.storage.paragraph.field_titre_du_chapitre.yml
 uuid: 25394f58-6e89-4912-b1de-e2d73ee54b2c
+========
+uuid: e2e5d683-8d2d-4e51-827b-4520ee09464e
+>>>>>>>> detached:config/sync/field.storage.paragraph.field_tableau.yml
+=======
+uuid: 7352aa7f-8aad-42f2-9935-738432d28e72
+>>>>>>> detached
 langcode: fr
 status: true
 dependencies:
   module:
     - paragraphs
+<<<<<<< HEAD
+<<<<<<<< HEAD:config/sync/field.storage.paragraph.field_titre_du_chapitre.yml
+=======
+>>>>>>> detached
     - text
 id: paragraph.field_titre_du_chapitre
 field_name: field_titre_du_chapitre
@@ -12,6 +24,18 @@ type: text
 settings:
   max_length: 255
 module: text
+<<<<<<< HEAD
+========
+    - tablefield
+id: paragraph.field_tableau
+field_name: field_tableau
+entity_type: paragraph
+type: tablefield
+settings: {  }
+module: tablefield
+>>>>>>>> detached:config/sync/field.storage.paragraph.field_tableau.yml
+=======
+>>>>>>> detached
 locked: false
 cardinality: 1
 translatable: true

config/sync/node.type.chapter.yml

@@ -1,18 +0,0 @@
-uuid: 2603250d-0b3f-46cc-a993-bd7eb299b9b0
-langcode: en
-status: true
-dependencies:
-  module:
-    - menu_ui
-third_party_settings:
-  menu_ui:
-    available_menus:
-      - main
-    parent: 'main:'
-name: Chapter
-type: chapter
-description: ''
-help: ''
-new_revision: true
-preview_mode: 1
-display_submitted: true

config/sync/paragraphs.paragraphs_type.image.yml

@@ -1,5 +1,10 @@
+<<<<<<< HEAD
 uuid: 30465cea-c3c2-428c-8372-3d2b252afca4
 langcode: fr
+=======
+uuid: ed2d4146-5ba0-469d-a33a-1439a58f6c25
+langcode: en
+>>>>>>> detached
 status: true
 dependencies: {  }
 id: image

config/sync/paragraphs.paragraphs_type.paragraph_chapitre.yml

@@ -0,0 +1,10 @@
+uuid: 7de9e3aa-1ff8-4ffb-aa2d-43fce5c47669
+langcode: fr
+status: true
+dependencies: {  }
+id: paragraph_chapitre
+label: Chapitre
+icon_uuid: null
+icon_default: null
+description: ''
+behavior_plugins: {  }

config/sync/paragraphs.paragraphs_type.sous_titre.yml

@@ -0,0 +1,10 @@
+uuid: 3bf76ac7-2684-4cd2-a0d3-4376b86946c8
+langcode: fr
+status: true
+dependencies: {  }
+id: sous_titre
+label: 'sous titre'
+icon_uuid: null
+icon_default: null
+description: ''
+behavior_plugins: {  }

config/sync/paragraphs.paragraphs_type.tableau.yml

@@ -1,9 +1,17 @@
+<<<<<<< HEAD
 uuid: 705b672c-74d3-4954-8485-2141b5122971
+=======
+uuid: f39f3cb9-a1ed-40a2-9124-7268edff581e
+>>>>>>> detached
 langcode: fr
 status: true
 dependencies: {  }
 id: tableau
+<<<<<<< HEAD
 label: Tableau
+=======
+label: tableau
+>>>>>>> detached
 icon_uuid: null
 icon_default: null
 description: 'ici on créer des tableaux'

config/sync/paragraphs.paragraphs_type.texte.yml

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 uuid: c36c36f3-b3f6-4d16-8847-c9412dfcca65
+=======
+uuid: a76931bf-dd04-4cf0-b0ac-4d77259c3407
+>>>>>>> detached
 langcode: fr
 status: true
 dependencies: {  }
@@ -6,5 +10,9 @@ id: texte
 label: Texte
 icon_uuid: null
 icon_default: null
+<<<<<<< HEAD
 description: 'ici on écrit du texte'
+=======
+description: ''
+>>>>>>> detached
 behavior_plugins: {  }

config/sync/paragraphs.paragraphs_type.titre_de_chapitre.yml

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 uuid: a362eeb3-a5f2-4b0c-9770-334acc8c8fbb
+=======
+uuid: 6d8d800d-5230-4fa7-b5e2-6b29880ba69c
+>>>>>>> detached
 langcode: fr
 status: true
 dependencies: {  }

config/sync/views.view.content.yml

@@ -403,7 +403,22 @@ display:
           plugin_id: text_custom
           empty: true
           content: 'Aucun contenu disponible.'
-      sorts: {  }
+      sorts:
+        langcode:
+          id: langcode
+          table: node_field_data
+          field: langcode
+          relationship: none
+          group_type: group
+          admin_label: 'tri par langue'
+          entity_type: node
+          entity_field: langcode
+          plugin_id: standard
+          order: ASC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
       arguments: {  }
       filters:
         title:

config/sync/views.view.copie_de_contenu.yml

@@ -0,0 +1,897 @@
+uuid: 1544868a-15b1-4a47-98e6-a594747add0b
+langcode: fr
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_lien_sommaire
+  module:
+    - book
+    - link
+    - node
+    - user
+_core:
+  default_config_hash: vBKWYGGDoAX-tFd1JErB8tZLSxx3lJ0foouVsgpcbB4
+id: copie_de_contenu
+label: 'Rorschach gérer Contenu'
+module: node
+description: 'Trouver et gérer le contenu.'
+tag: default
+base_table: node_field_data
+base_field: nid
+display:
+  default:
+    id: default
+    display_title: 'Par défaut'
+    display_plugin: default
+    position: 0
+    display_options:
+      title: Contenu
+      fields:
+        node_bulk_form:
+          id: node_bulk_form
+          table: node
+          field: node_bulk_form
+          entity_type: node
+          plugin_id: node_bulk_form
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+          element_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          entity_type: node
+          entity_field: title
+          plugin_id: field
+          label: Titre
+          exclude: false
+          alter:
+            alter_text: false
+          element_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: string
+          settings:
+            link_to_entity: true
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: type
+          plugin_id: field
+          label: 'Type de contenu'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        name:
+          id: name
+          table: users_field_data
+          field: name
+          relationship: uid
+          entity_type: user
+          entity_field: name
+          plugin_id: field
+          label: Auteur
+          exclude: false
+          alter:
+            alter_text: false
+          element_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: user_name
+        status:
+          id: status
+          table: node_field_data
+          field: status
+          entity_type: node
+          entity_field: status
+          plugin_id: field
+          label: État
+          exclude: false
+          alter:
+            alter_text: false
+          element_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: boolean
+          settings:
+            format: custom
+            format_custom_false: 'Non publié'
+            format_custom_true: Publié
+        changed:
+          id: changed
+          table: node_field_data
+          field: changed
+          entity_type: node
+          entity_field: changed
+          plugin_id: field
+          label: 'Mis à jour'
+          exclude: false
+          alter:
+            alter_text: false
+          element_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: timestamp
+          settings:
+            date_format: short
+            custom_date_format: ''
+            timezone: ''
+        operations:
+          id: operations
+          table: node
+          field: operations
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: entity_operations
+          label: Actions
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          destination: true
+        langcode:
+          id: langcode
+          table: node_field_data
+          field: langcode
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: langcode
+          plugin_id: field
+          label: 'Langue de traduction'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: language
+          settings:
+            link_to_entity: false
+            native_language: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        content_translation_outdated:
+          id: content_translation_outdated
+          table: node_field_revision
+          field: content_translation_outdated
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: content_translation_outdated
+          plugin_id: field
+          label: 'Translation outdated'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: boolean
+          settings:
+            format: yes-no
+            format_custom_false: ''
+            format_custom_true: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        has_children:
+          id: has_children
+          table: book
+          field: has_children
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: boolean
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: true-false
+          type_custom_true: ''
+          type_custom_false: ''
+          not: false
+        field_lien_sommaire:
+          id: field_lien_sommaire
+          table: node__field_lien_sommaire
+          field: field_lien_sommaire
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: field
+          label: 'lien sommaire'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: uri
+          type: link
+          settings:
+            trim_length: 80
+            url_only: false
+            url_plain: false
+            rel: '0'
+            target: '0'
+          group_column: ''
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+      pager:
+        type: full
+        options:
+          items_per_page: 50
+          tags:
+            next: 'Suivant ›'
+            previous: '‹ Précédent'
+            first: '« Premier'
+            last: 'Dernier »'
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Filtrer
+          reset_button: true
+          reset_button_label: Réinitialiser
+          exposed_sorts_label: 'Trier par'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'access content overview'
+      cache:
+        type: tag
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          plugin_id: text_custom
+          empty: true
+          content: 'Aucun contenu disponible.'
+      sorts: {  }
+      arguments: {  }
+      filters:
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: title
+          plugin_id: string
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: title_op
+            label: Titre
+            description: ''
+            use_operator: false
+            operator: title_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: title
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: type
+          plugin_id: bundle
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: type_op
+            label: 'Type de contenu'
+            description: ''
+            use_operator: false
+            operator: type_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: type
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+        status:
+          id: status
+          table: node_field_data
+          field: status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: status
+          plugin_id: boolean
+          operator: '='
+          value: '1'
+          group: 1
+          exposed: true
+          expose:
+            operator_id: ''
+            label: État
+            description: ''
+            use_operator: false
+            operator: status_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: status
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: true
+          group_info:
+            label: 'Statut de publication'
+            description: ''
+            identifier: status
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items:
+              1:
+                title: Publié
+                operator: '='
+                value: '1'
+              2:
+                title: 'Non publié'
+                operator: '='
+                value: '0'
+        langcode:
+          id: langcode
+          table: node_field_data
+          field: langcode
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: langcode
+          plugin_id: language
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: langcode_op
+            label: Langue
+            description: ''
+            use_operator: false
+            operator: langcode_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: langcode
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+        status_extra:
+          id: status_extra
+          table: node_field_data
+          field: status_extra
+          entity_type: node
+          plugin_id: node_status
+          operator: '='
+          value: false
+          group: 1
+          expose:
+            operator_limit_selection: false
+            operator_list: {  }
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      style:
+        type: table
+        options:
+          grouping:
+            -
+              field: langcode
+              rendered: true
+              rendered_strip: false
+          row_class: ''
+          default_row_class: true
+          columns:
+            node_bulk_form: node_bulk_form
+            title: title
+            type: type
+            name: name
+            status: status
+            changed: changed
+            operations: operations
+            langcode: langcode
+            content_translation_outdated: content_translation_outdated
+            has_children: has_children
+            field_lien_sommaire: field_lien_sommaire
+          default: '-1'
+          info:
+            node_bulk_form:
+              align: views-align-left
+              separator: ''
+              empty_column: false
+              responsive: ''
+            title:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            type:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            name:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            status:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            changed:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            operations:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            langcode:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            content_translation_outdated:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            has_children:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            field_lien_sommaire:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          override: true
+          sticky: false
+          summary: ''
+          empty_table: false
+          caption: ''
+          description: ''
+      row:
+        type: fields
+        options:
+          default_field_elements: true
+          inline:
+            node_bulk_form: node_bulk_form
+            title: title
+            type: type
+            operations: operations
+            langcode: langcode
+            content_translation_outdated: content_translation_outdated
+            has_children: has_children
+          separator: ''
+          hide_empty: false
+      query:
+        type: views_query
+      relationships:
+        uid:
+          id: uid
+          table: node_field_data
+          field: uid
+          admin_label: author
+          plugin_id: standard
+          required: true
+      show_admin_links: true
+      display_extenders: {  }
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user
+        - 'user.node_grants:view'
+        - user.permissions
+      tags:
+        - 'config:field.storage.node.field_lien_sommaire'
+  page_1:
+    id: page_1
+    display_title: Page
+    display_plugin: page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: admin/content/node
+      menu:
+        type: 'default tab'
+        title: Contenu
+        description: ''
+        weight: -10
+        expanded: false
+        menu_name: admin
+        parent: ''
+        context: '0'
+      tab_options:
+        type: normal
+        title: Contenu
+        description: 'Trouver et gérer le contenu'
+        weight: -10
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user
+        - 'user.node_grants:view'
+        - user.permissions
+      tags:
+        - 'config:field.storage.node.field_lien_sommaire'

config/sync/views.view.list_of_language.yml

@@ -1,3 +1,4 @@
+<<<<<<<< HEAD:config/sync/views.view.list_of_language.yml
 uuid: c9b0e3d7-4fa0-4b83-94dd-3925ed4be6e3
 langcode: fr
 status: true
@@ -7,6 +8,19 @@ dependencies:
     - user
 id: list_of_language
 label: 'list of language'
+========
+uuid: 3b5f8fe9-72c1-454c-8f0b-56b79c034bf4
+langcode: fr
+status: true
+dependencies:
+  config:
+    - node.type.book
+  module:
+    - node
+    - user
+id: sommaire_test
+label: 'Sommaire test'
+>>>>>>>> detached:config/sync/views.view.sommaire_test.yml
 module: views
 description: 'all language to choose one'
 tag: ''
@@ -19,7 +33,11 @@ display:
     display_plugin: default
     position: 0
     display_options:
+<<<<<<<< HEAD:config/sync/views.view.list_of_language.yml
       title: 'list of language'
+========
+      title: 'Sommaire test'
+>>>>>>>> detached:config/sync/views.view.sommaire_test.yml
       fields:
         title:
           id: title
@@ -153,10 +171,33 @@ display:
           separator: ', '
           field_api_classes: false
       pager:
+<<<<<<<< HEAD:config/sync/views.view.list_of_language.yml
         type: some
         options:
           offset: 0
           items_per_page: 5
+========
+        type: full
+        options:
+          offset: 0
+          items_per_page: 20
+          total_pages: null
+          id: 0
+          tags:
+            next: 'Suivant ›'
+            previous: '‹ Précédent'
+            first: '« Premier'
+            last: 'Dernier »'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Éléments par page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- Tout -'
+            offset: false
+            offset_label: Décalage
+          quantity: 9
+>>>>>>>> detached:config/sync/views.view.sommaire_test.yml
       exposed_form:
         type: basic
         options:
@@ -175,7 +216,26 @@ display:
         type: tag
         options: {  }
       empty: {  }
+<<<<<<<< HEAD:config/sync/views.view.list_of_language.yml
       sorts: {  }
+========
+      sorts:
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: title
+          plugin_id: standard
+          order: ASC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
+>>>>>>>> detached:config/sync/views.view.sommaire_test.yml
       arguments: {  }
       filters:
         status:
@@ -191,6 +251,21 @@ display:
             operator: ''
             operator_limit_selection: false
             operator_list: {  }
+<<<<<<<< HEAD:config/sync/views.view.list_of_language.yml
+========
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          entity_type: node
+          entity_field: type
+          plugin_id: bundle
+          value:
+            book: book
+          expose:
+            operator_limit_selection: false
+            operator_list: {  }
+>>>>>>>> detached:config/sync/views.view.sommaire_test.yml
       style:
         type: default
       row:
@@ -215,9 +290,15 @@ display:
         - 'user.node_grants:view'
         - user.permissions
       tags: {  }
+<<<<<<<< HEAD:config/sync/views.view.list_of_language.yml
   block_language_disponible:
     id: block_language_disponible
     display_title: Block_language_disponible
+========
+  block_1:
+    id: block_1
+    display_title: Block
+>>>>>>>> detached:config/sync/views.view.sommaire_test.yml
     display_plugin: block
     position: 1
     display_options:

config/sync/views.view.sommaire_test.yml

@@ -0,0 +1,315 @@
+<<<<<<<< HEAD:config/sync/views.view.list_of_language.yml
+uuid: c9b0e3d7-4fa0-4b83-94dd-3925ed4be6e3
+langcode: fr
+status: true
+dependencies:
+  module:
+    - node
+    - user
+id: list_of_language
+label: 'list of language'
+========
+uuid: 3b5f8fe9-72c1-454c-8f0b-56b79c034bf4
+langcode: fr
+status: true
+dependencies:
+  config:
+    - node.type.book
+  module:
+    - node
+    - user
+id: sommaire_test
+label: 'Sommaire test'
+>>>>>>>> detached:config/sync/views.view.sommaire_test.yml
+module: views
+description: 'all language to choose one'
+tag: ''
+base_table: node_field_data
+base_field: nid
+display:
+  default:
+    id: default
+    display_title: Default
+    display_plugin: default
+    position: 0
+    display_options:
+<<<<<<<< HEAD:config/sync/views.view.list_of_language.yml
+      title: 'list of language'
+========
+      title: 'Sommaire test'
+>>>>>>>> detached:config/sync/views.view.sommaire_test.yml
+      fields:
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: title
+          plugin_id: field
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: false
+            ellipsis: false
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        langcode:
+          id: langcode
+          table: node_field_data
+          field: langcode
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: langcode
+          plugin_id: field
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: language
+          settings:
+            link_to_entity: false
+            native_language: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+      pager:
+<<<<<<<< HEAD:config/sync/views.view.list_of_language.yml
+        type: some
+        options:
+          offset: 0
+          items_per_page: 5
+========
+        type: full
+        options:
+          offset: 0
+          items_per_page: 20
+          total_pages: null
+          id: 0
+          tags:
+            next: 'Suivant ›'
+            previous: '‹ Précédent'
+            first: '« Premier'
+            last: 'Dernier »'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Éléments par page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- Tout -'
+            offset: false
+            offset_label: Décalage
+          quantity: 9
+>>>>>>>> detached:config/sync/views.view.sommaire_test.yml
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      empty: {  }
+<<<<<<<< HEAD:config/sync/views.view.list_of_language.yml
+      sorts: {  }
+========
+      sorts:
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: title
+          plugin_id: standard
+          order: ASC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
+>>>>>>>> detached:config/sync/views.view.sommaire_test.yml
+      arguments: {  }
+      filters:
+        status:
+          id: status
+          table: node_field_data
+          field: status
+          entity_type: node
+          entity_field: status
+          plugin_id: boolean
+          value: '1'
+          group: 1
+          expose:
+            operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
+<<<<<<<< HEAD:config/sync/views.view.list_of_language.yml
+========
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          entity_type: node
+          entity_field: type
+          plugin_id: bundle
+          value:
+            book: book
+          expose:
+            operator_limit_selection: false
+            operator_list: {  }
+>>>>>>>> detached:config/sync/views.view.sommaire_test.yml
+      style:
+        type: default
+      row:
+        type: fields
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      relationships: {  }
+      header: {  }
+      footer: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - 'user.node_grants:view'
+        - user.permissions
+      tags: {  }
+<<<<<<<< HEAD:config/sync/views.view.list_of_language.yml
+  block_language_disponible:
+    id: block_language_disponible
+    display_title: Block_language_disponible
+========
+  block_1:
+    id: block_1
+    display_title: Block
+>>>>>>>> detached:config/sync/views.view.sommaire_test.yml
+    display_plugin: block
+    position: 1
+    display_options:
+      display_description: ''
+      rendering_language: '***LANGUAGE_entity_translation***'
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - 'user.node_grants:view'
+        - user.permissions
+      tags: {  }