diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.banner_block.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.banner_block.default.yml index 5dd5dd513fd4095fa935500d16f82dba152b5901..c2727589d94da1ee9661eedb8750926dd8eb93a9 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.banner_block.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.banner_block.default.yml @@ -56,4 +56,5 @@ content: size: 60 placeholder: '' third_party_settings: { } -hidden: { } +hidden: + moderation_state: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.basic.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.basic.default.yml index 7ccb5b0ad374dac3f1c5e9e98d5d8035c6d4d7c3..a60d7db281b1fc59c5c026a5029cef80cf0848fe 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.basic.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.basic.default.yml @@ -28,4 +28,5 @@ content: size: 60 placeholder: '' third_party_settings: { } -hidden: { } +hidden: + moderation_state: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.disclaimer_block.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.disclaimer_block.default.yml index a64f7c280570861288c1f16f1ce6c29769843f58..386ff59c2a9d84a34ac96523fe5099836b18c4a9 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.disclaimer_block.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.disclaimer_block.default.yml @@ -36,4 +36,5 @@ content: size: 60 placeholder: '' third_party_settings: { } -hidden: { } +hidden: + moderation_state: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.footer_promo_block.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.footer_promo_block.default.yml index 041af3772b81a37823a7fca6ebe87ad46231b520..81b95045dd28cf5786a72e90000378a962885e38 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.footer_promo_block.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.footer_promo_block.default.yml @@ -56,4 +56,5 @@ content: size: 60 placeholder: '' third_party_settings: { } -hidden: { } +hidden: + moderation_state: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.media.audio.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.media.audio.default.yml index 28979932bff7c8f48c9df32b0953e175e34ebb89..38efab24a78818bb050525ce9ced81cf9923fea7 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.media.audio.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.media.audio.default.yml @@ -55,4 +55,5 @@ content: placeholder: '' region: content third_party_settings: { } -hidden: { } +hidden: + moderation_state: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.media.file.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.media.file.default.yml index da145039fcf78298c08b6eb3e0962b4dc6d16be5..16536c8127fd0ec1875c7487c61d33b4c3c98b7f 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.media.file.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.media.file.default.yml @@ -55,4 +55,5 @@ content: placeholder: '' region: content third_party_settings: { } -hidden: { } +hidden: + moderation_state: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.media.image.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.media.image.default.yml index fb18dfe483f28be045fa9943da55ead503c0f120..06ab5d285e94e56e94b24c1dfd2c85ac5c14e3b7 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.media.image.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.media.image.default.yml @@ -57,4 +57,5 @@ content: placeholder: '' region: content third_party_settings: { } -hidden: { } +hidden: + moderation_state: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.media.remote_video.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.media.remote_video.default.yml index 4752e75274aca607d8ed33d07579262a6577412c..d0924b704298b55930f6e909f761ebee461bc004 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.media.remote_video.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.media.remote_video.default.yml @@ -41,7 +41,7 @@ content: third_party_settings: { } uid: type: entity_reference_autocomplete - weight: 5 + weight: 4 settings: match_operator: CONTAINS size: 60 @@ -49,4 +49,5 @@ content: region: content third_party_settings: { } hidden: + moderation_state: true name: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.media.video.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.media.video.default.yml index d0fa5049d5bf9f97319930e747cf6b68d2d15656..6658cb930f809be7c4a0e4ba83c9b4670b172dd6 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.media.video.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.media.video.default.yml @@ -55,4 +55,5 @@ content: placeholder: '' region: content third_party_settings: { } -hidden: { } +hidden: + moderation_state: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.node.article.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.node.article.default.yml index 122c53e37c95aeb5b80c3238d66b61c9d5f0c246..50db6035b74aba1bbbb5d2a40f94f9f22936c242 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.node.article.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.node.article.default.yml @@ -8,6 +8,7 @@ dependencies: - image.style.thumbnail - node.type.article module: + - content_moderation - image - path - text @@ -27,13 +28,13 @@ content: third_party_settings: { } created: type: datetime_timestamp - weight: 10 + weight: 5 region: content settings: { } third_party_settings: { } field_image: type: image_image - weight: 4 + weight: 3 region: content settings: progress_indicator: throbber @@ -41,13 +42,22 @@ content: third_party_settings: { } field_tags: type: entity_reference_autocomplete_tags - weight: 3 + weight: 2 + region: content + settings: + match_operator: CONTAINS + size: 60 + placeholder: '' + third_party_settings: { } + moderation_state: + type: moderation_state_default + weight: 10 region: content settings: { } third_party_settings: { } path: type: path - weight: 30 + weight: 8 region: content settings: { } third_party_settings: { } @@ -55,21 +65,21 @@ content: type: boolean_checkbox settings: display_label: true - weight: 15 + weight: 6 region: content third_party_settings: { } status: type: boolean_checkbox settings: display_label: true - weight: 120 + weight: 9 region: content third_party_settings: { } sticky: type: boolean_checkbox settings: display_label: true - weight: 16 + weight: 7 region: content third_party_settings: { } title: @@ -82,7 +92,7 @@ content: third_party_settings: { } uid: type: entity_reference_autocomplete - weight: 5 + weight: 4 region: content settings: match_operator: CONTAINS diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.node.page.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.node.page.default.yml index 682f1a550cbaa32008cabbe2b7c10c4289e73177..9a896e5a33714607333dfd698faf702abc5ddc61 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.node.page.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.node.page.default.yml @@ -5,6 +5,7 @@ dependencies: - field.field.node.page.body - node.type.page module: + - content_moderation - path - text id: node.page.default @@ -14,7 +15,7 @@ mode: default content: body: type: text_textarea_with_summary - weight: 31 + weight: 6 region: content settings: rows: 9 @@ -23,13 +24,19 @@ content: third_party_settings: { } created: type: datetime_timestamp - weight: 10 + weight: 2 + region: content + settings: { } + third_party_settings: { } + moderation_state: + type: moderation_state_default + weight: 8 region: content settings: { } third_party_settings: { } path: type: path - weight: 30 + weight: 5 region: content settings: { } third_party_settings: { } @@ -37,26 +44,26 @@ content: type: boolean_checkbox settings: display_label: true - weight: 15 + weight: 3 region: content third_party_settings: { } status: type: boolean_checkbox settings: display_label: true - weight: 120 + weight: 7 region: content third_party_settings: { } sticky: type: boolean_checkbox settings: display_label: true - weight: 16 + weight: 4 region: content third_party_settings: { } title: type: string_textfield - weight: -5 + weight: 0 region: content settings: size: 60 @@ -64,7 +71,7 @@ content: third_party_settings: { } uid: type: entity_reference_autocomplete - weight: 5 + weight: 1 region: content settings: match_operator: CONTAINS diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.node.recipe.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.node.recipe.default.yml index 56a53cb3c00eae851febecb8448be608252355fa..42cd68e0bea1de477b8c87eac041d37388129d3f 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.node.recipe.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.node.recipe.default.yml @@ -16,6 +16,7 @@ dependencies: - image.style.thumbnail - node.type.recipe module: + - content_moderation - image - path - text @@ -116,6 +117,12 @@ content: third_party_settings: { } type: entity_reference_autocomplete_tags region: content + moderation_state: + type: moderation_state_default + weight: 18 + region: content + settings: { } + third_party_settings: { } path: type: path weight: 16 diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.default.yml index a544c6872efd8d74be6940c9c6c169bb8507c6bf..66a013a76d3fb4feebd1b522d7ea409aa8409b1a 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.default.yml @@ -45,4 +45,5 @@ content: region: content settings: { } third_party_settings: { } -hidden: { } +hidden: + content_moderation_control: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.full.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.full.yml index 2e224525160623710d949137426ba6c80ecae0cd..e122e4f47a29a88da287b422ca8def2a4308e100 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.full.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.full.yml @@ -46,4 +46,5 @@ content: region: content settings: { } third_party_settings: { } -hidden: { } +hidden: + content_moderation_control: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_bottom.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_bottom.yml index c2a0515e49ae1a753f2576801fa6738f69fbb237..6a7ea887684ed3be2cacf693d97fef16730bb2f5 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_bottom.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_bottom.yml @@ -27,5 +27,6 @@ content: label: hidden hidden: body: true + content_moderation_control: true field_tags: true links: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_medium.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_medium.yml index 6d5fccd17eade514a10c4db7465a2afd15200e04..62890f5af36c0f728f1b05aa18c764134df59e47 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_medium.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_medium.yml @@ -27,5 +27,6 @@ content: label: hidden hidden: body: true + content_moderation_control: true field_tags: true links: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_small.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_small.yml index db32e7f4c50f157ee86af232dfebbcd9f5a2b389..eb9a28eb965df6790b556c41642d5a0c38a3c79a 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_small.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_small.yml @@ -27,5 +27,6 @@ content: label: hidden hidden: body: true + content_moderation_control: true field_tags: true links: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_top.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_top.yml index c943e422461915d689484373cb758b9e42d72486..5a3926ac86c2afd24b08f527aa1f97e4330a964d 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_top.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_top.yml @@ -27,5 +27,6 @@ content: label: hidden hidden: body: true + content_moderation_control: true field_tags: true links: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.rss.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.rss.yml index da445c08d232fabf7932279a3b24b375d389d8a7..df4d92d8ec99bd3aff52bc813587de38ac574567 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.rss.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.rss.yml @@ -19,5 +19,6 @@ content: region: content hidden: body: true + content_moderation_control: true field_image: true field_tags: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.teaser.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.teaser.yml index 2731e1883a9695b9f6a9f622a7eaad177ca79643..23f4a07dd5125980fb06d5c5220cb513a9c9384f 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.teaser.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.teaser.yml @@ -47,4 +47,5 @@ content: region: content settings: { } third_party_settings: { } -hidden: { } +hidden: + content_moderation_control: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.default.yml index 8afd9423ec6b1ff096449348c92b555d415c9877..29e721a67f6ae138f1928e08df4a7e0a75a33ba5 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.default.yml @@ -22,4 +22,5 @@ content: links: weight: 101 region: content -hidden: { } +hidden: + content_moderation_control: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.teaser.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.teaser.yml index bc7a68c5b5fd3f69ad1b1685cfc9efde1e6cd799..ce8cd320fe51e5b205cdddf32c4d6aba0a5f57c7 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.teaser.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.teaser.yml @@ -24,4 +24,5 @@ content: links: weight: 101 region: content -hidden: { } +hidden: + content_moderation_control: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.default.yml index 42c0ed02bb9b0ba914f9283bff6b7fa9a5153707..deaf2bb42b0e12557eb5253c42e3d33119e326ab 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.default.yml @@ -112,4 +112,5 @@ content: settings: { } third_party_settings: { } hidden: + content_moderation_control: true field_author: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.full.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.full.yml index deda0996cb01556aae269ef99e83845edfdc6c40..bac74a2e8e6b9a45c0a802c7127e9468714cd417 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.full.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.full.yml @@ -113,4 +113,5 @@ content: settings: { } third_party_settings: { } hidden: + content_moderation_control: true field_author: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_bottom.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_bottom.yml index a5d2a7bcb4d00bc3b639264050408e1ba7419739..5bae8dfd2e99672eb1a755634ad225f4ef6b069c 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_bottom.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_bottom.yml @@ -34,6 +34,7 @@ content: type: responsive_image region: content hidden: + content_moderation_control: true field_author: true field_cooking_time: true field_difficulty: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_medium.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_medium.yml index 0025d27f7b2157d2ad146a12f99a70c5b5c17ce4..d8898645d1285878668f96bc95de3fbc3295ab4f 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_medium.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_medium.yml @@ -47,6 +47,7 @@ content: settings: { } third_party_settings: { } hidden: + content_moderation_control: true field_author: true field_cooking_time: true field_ingredients: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_small.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_small.yml index 8f7971ca39fa185967e2cff1547d06edf9bcea31..7c622d2637b78cdce1d7527da15356ecead000cd 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_small.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_small.yml @@ -47,6 +47,7 @@ content: settings: { } third_party_settings: { } hidden: + content_moderation_control: true field_author: true field_cooking_time: true field_ingredients: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_top.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_top.yml index f71cb276045d2c148a335372d3904ebecbba8455..ac5736d6b49b10f4ba439e76cba10192e4c33a3b 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_top.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_top.yml @@ -34,6 +34,7 @@ content: type: responsive_image region: content hidden: + content_moderation_control: true field_author: true field_cooking_time: true field_difficulty: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.teaser.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.teaser.yml index 564968462ac58b49e12cd557fa250078422167ae..a576765dfa5a008cf52da9311f52cc32c72b8680 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.teaser.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.teaser.yml @@ -26,6 +26,7 @@ content: weight: 100 region: content hidden: + content_moderation_control: true field_author: true field_cooking_time: true field_difficulty: true diff --git a/core/profiles/demo_umami/config/install/user.role.author.yml b/core/profiles/demo_umami/config/install/user.role.author.yml new file mode 100644 index 0000000000000000000000000000000000000000..346f946cd0146e450f67874af71629e6ff3757c9 --- /dev/null +++ b/core/profiles/demo_umami/config/install/user.role.author.yml @@ -0,0 +1,48 @@ +langcode: en +status: true +dependencies: { } +id: author +label: Author +weight: 3 +is_admin: null +permissions: + - 'access content overview' + - 'access contextual links' + - 'access files overview' + - 'access in-place editing' + - 'access toolbar' + - 'cancel account' + - 'change own username' + - 'create article content' + - 'create page content' + - 'create recipe content' + - 'create terms in ingredients' + - 'create terms in recipe_category' + - 'create terms in recipe_cuisine' + - 'create terms in tags' + - 'create url aliases' + - 'delete article revisions' + - 'delete own article content' + - 'delete own page content' + - 'delete own recipe content' + - 'delete page revisions' + - 'delete recipe revisions' + - 'delete terms in ingredients' + - 'delete terms in recipe_category' + - 'delete terms in recipe_cuisine' + - 'delete terms in tags' + - 'edit own article content' + - 'edit own page content' + - 'edit own recipe content' + - 'edit terms in ingredients' + - 'edit terms in recipe_category' + - 'edit terms in recipe_cuisine' + - 'edit terms in tags' + - 'use editorial transition create_new_draft' + - 'view all revisions' + - 'view article revisions' + - 'view latest version' + - 'view own unpublished content' + - 'view page revisions' + - 'view recipe revisions' + - 'view the administration theme' diff --git a/core/profiles/demo_umami/config/install/user.role.editor.yml b/core/profiles/demo_umami/config/install/user.role.editor.yml new file mode 100644 index 0000000000000000000000000000000000000000..11bb67c628d5e61038f7ca3128c03ec446e01689 --- /dev/null +++ b/core/profiles/demo_umami/config/install/user.role.editor.yml @@ -0,0 +1,52 @@ +langcode: en +status: true +dependencies: { } +id: editor +label: Editor +weight: 4 +is_admin: null +permissions: + - 'access content overview' + - 'access contextual links' + - 'access files overview' + - 'access in-place editing' + - 'access toolbar' + - 'cancel account' + - 'change own username' + - 'create terms in ingredients' + - 'create terms in recipe_category' + - 'create terms in recipe_cuisine' + - 'create terms in tags' + - 'create url aliases' + - 'delete all revisions' + - 'delete any article content' + - 'delete any page content' + - 'delete any recipe content' + - 'delete article revisions' + - 'delete page revisions' + - 'delete recipe revisions' + - 'delete terms in ingredients' + - 'delete terms in recipe_category' + - 'delete terms in recipe_cuisine' + - 'delete terms in tags' + - 'edit any article content' + - 'edit any page content' + - 'edit any recipe content' + - 'edit terms in ingredients' + - 'edit terms in recipe_category' + - 'edit terms in recipe_cuisine' + - 'edit terms in tags' + - 'revert all revisions' + - 'revert article revisions' + - 'revert page revisions' + - 'revert recipe revisions' + - 'use editorial transition archive' + - 'use editorial transition archived_published' + - 'use editorial transition publish' + - 'view all revisions' + - 'view any unpublished content' + - 'view article revisions' + - 'view latest version' + - 'view page revisions' + - 'view recipe revisions' + - 'view the administration theme' diff --git a/core/profiles/demo_umami/config/install/workflows.workflow.editorial.yml b/core/profiles/demo_umami/config/install/workflows.workflow.editorial.yml new file mode 100644 index 0000000000000000000000000000000000000000..9959410e1e68af724079162268aa968a424e46f9 --- /dev/null +++ b/core/profiles/demo_umami/config/install/workflows.workflow.editorial.yml @@ -0,0 +1,67 @@ +langcode: en +status: true +dependencies: + config: + - node.type.article + - node.type.page + - node.type.recipe + module: + - content_moderation +id: editorial +label: Editorial +type: content_moderation +type_settings: + states: + archived: + label: Archived + weight: 5 + published: false + default_revision: true + draft: + label: Draft + published: false + default_revision: false + weight: -5 + published: + label: Published + published: true + default_revision: true + weight: 0 + transitions: + archive: + label: Archive + from: + - published + to: archived + weight: 2 + archived_draft: + label: 'Restore to Draft' + from: + - archived + to: draft + weight: 3 + archived_published: + label: Restore + from: + - archived + to: published + weight: 4 + create_new_draft: + label: 'Create New Draft' + to: draft + weight: 0 + from: + - draft + - published + publish: + label: Publish + to: published + weight: 1 + from: + - draft + - published + entity_types: + node: + - article + - page + - recipe diff --git a/core/profiles/demo_umami/demo_umami.info.yml b/core/profiles/demo_umami/demo_umami.info.yml index 48de3411d630b949a2fa8d9e342f386cd541fd11..98be81fffe6852a0ef9da9eb4f8e933277a22657 100644 --- a/core/profiles/demo_umami/demo_umami.info.yml +++ b/core/profiles/demo_umami/demo_umami.info.yml @@ -40,6 +40,8 @@ install: - tour - automated_cron - responsive_image + - content_moderation + - workflows themes: - seven - umami diff --git a/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php b/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php index b9b855d55c299054f2e9d8b21b554a8cf9a9060f..1268189082556c1b102b49e87aeb9620f85c1f71 100644 --- a/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php +++ b/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php @@ -81,12 +81,41 @@ public static function create(ContainerInterface $container) { * Imports default contents. */ public function importContent() { - $this->importArticles() + $this->importEditors() + ->importArticles() ->importRecipes() ->importPages() ->importBlockContent(); } + /** + * Imports editors. + * + * Other users are created as their content is imported. However, editors + * don't have their own content so are created here instead. + * + * @return $this + */ + protected function importEditors() { + $user_storage = $this->entityTypeManager->getStorage('user'); + $editors = [ + 'Margaret Hopper', + 'Grace Hamilton', + ]; + foreach ($editors as $name) { + $user = $user_storage->create([ + 'name' => $name, + 'status' => 1, + 'roles' => ['editor'], + 'mail' => mb_strtolower(str_replace(' ', '.', $name)) . '@example.com', + ]); + $user->enforceIsNew(); + $user->save(); + $this->storeCreatedContentUuids([$user->uuid() => 'user']); + } + return $this; + } + /** * Imports articles. * @@ -104,6 +133,7 @@ protected function importArticles() { $values = [ 'type' => 'article', 'title' => $data['title'], + 'moderation_state' => 'published', ]; // Fields mapping starts. // Set Body Field. @@ -167,6 +197,7 @@ protected function importRecipes() { 'type' => 'recipe', // Title field. 'title' => $data['title'], + 'moderation_state' => 'published', ]; // Set article author. if (!empty($data['author'])) { @@ -264,6 +295,7 @@ protected function importPages() { $values = [ 'type' => 'page', 'title' => $data['title'], + 'moderation_state' => 'published', ]; // Fields mapping starts. // Set Body Field. @@ -401,10 +433,11 @@ protected function getUser($name) { $user_storage = $this->entityTypeManager->getStorage('user'); $users = $user_storage->loadByProperties(['name' => $name]);; if (empty($users)) { - // Creating user without any email/password. + // Creating user without any password. $user = $user_storage->create([ 'name' => $name, 'status' => 1, + 'roles' => ['author'], 'mail' => mb_strtolower(str_replace(' ', '.', $name)) . '@example.com', ]); $user->enforceIsNew(); diff --git a/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php b/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php index f6025fd6034939744f730636ae90cb979dbd22ce..940c8e2aa049861b15de8e97c232ab98bdb01735 100644 --- a/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php +++ b/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php @@ -89,7 +89,12 @@ protected function assertDefaultConfig(StorageInterface $default_config_storage, * Tests the successful editing of nodes by admin. */ public function testEditNodesByAdmin() { - $account = $this->drupalCreateUser(['administer nodes', 'edit any recipe content']); + $permissions = [ + 'administer nodes', + 'edit any recipe content', + 'use editorial transition create_new_draft', + ]; + $account = $this->drupalCreateUser($permissions); $this->drupalLogin($account); $webassert = $this->assertSession(); @@ -122,10 +127,11 @@ public function testAppearance() { public function testDemonstrationWarningMessage() { $permissions = [ 'access content overview', + 'access toolbar', 'administer nodes', - 'create recipe content', 'edit any recipe content', - 'access toolbar', + 'create recipe content', + 'use editorial transition create_new_draft', ]; $account = $this->drupalCreateUser($permissions); $this->drupalLogin($account);