From 09c93f22eabe03df8615a56c6b7e2d08d2961f7e Mon Sep 17 00:00:00 2001 From: James Morton Date: Fri, 16 Sep 2022 09:59:18 -0400 Subject: [PATCH 1/2] Trying to allow the app to be uninstalled properly --- brown_d8react_integration.module | 5 ++++- ...ld.paragraph.react_app.field_dreact_app_config.yml | 11 ++++++----- .../paragraph--brown-d8react-integration.html.twig | 5 +++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/brown_d8react_integration.module b/brown_d8react_integration.module index 2690bfe..c58c09f 100644 --- a/brown_d8react_integration.module +++ b/brown_d8react_integration.module @@ -46,6 +46,9 @@ function brown_d8react_integration_theme() { return array( 'paragraph__react_app' => array( 'template' => 'paragraph--brown-d8react-integration', + 'variables' => [ + 'noscript' => 'noscript', + ], 'base hook' => 'paragraph' ), ); @@ -54,7 +57,7 @@ function brown_d8react_integration_theme() { function brown_d8react_integration_page_attachments(array &$page) { $canOnlyEditConfig = false; $user = \Drupal::currentUser(); - +t if ($user->hasPermission('edit react app config') && !$user->hasPermission('insert react micro-app')) { $canOnlyEditConfig = true; } diff --git a/config/install/field.field.paragraph.react_app.field_dreact_app_config.yml b/config/install/field.field.paragraph.react_app.field_dreact_app_config.yml index d874031..6a8091c 100644 --- a/config/install/field.field.paragraph.react_app.field_dreact_app_config.yml +++ b/config/install/field.field.paragraph.react_app.field_dreact_app_config.yml @@ -1,11 +1,12 @@ langcode: en status: true dependencies: - config: - - field.storage.paragraph.field_dreact_app_config - - paragraphs.paragraphs_type.react_app - module: - - brown_d8react_integration + enforced: + config: + - field.storage.paragraph.field_dreact_app_config + - paragraphs.paragraphs_type.react_app + module: + - brown_d8react_integration id: paragraph.react_app.field_dreact_app_config field_name: field_dreact_app_config entity_type: paragraph diff --git a/templates/paragraph--brown-d8react-integration.html.twig b/templates/paragraph--brown-d8react-integration.html.twig index 81a4e23..8699ae7 100644 --- a/templates/paragraph--brown-d8react-integration.html.twig +++ b/templates/paragraph--brown-d8react-integration.html.twig @@ -1,12 +1,17 @@
+{% set config = "" %} {% if content.field_dreact_app_config[0]['#markup'] %} + {% set config = content.field_dreact_app_config[0]['#markup']|json_encode|raw %} {% else %} + {% set config = content.field_dreact_app_config[0]['#markup']|json_encode|raw %} {% endif %} +{% dump(config) %} + {% if 'On' in content.field_pass_user_data[0] %} {% set currentUser = { From c59c94a20b2e495138522fd7eaae378cc1d82df8 Mon Sep 17 00:00:00 2001 From: James Morton Date: Fri, 16 Sep 2022 10:03:27 -0400 Subject: [PATCH 2/2] fixing issue --- brown_d8react_integration.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brown_d8react_integration.module b/brown_d8react_integration.module index c58c09f..852cbae 100644 --- a/brown_d8react_integration.module +++ b/brown_d8react_integration.module @@ -57,7 +57,7 @@ function brown_d8react_integration_theme() { function brown_d8react_integration_page_attachments(array &$page) { $canOnlyEditConfig = false; $user = \Drupal::currentUser(); -t + if ($user->hasPermission('edit react app config') && !$user->hasPermission('insert react micro-app')) { $canOnlyEditConfig = true; }