From 51436595b91c9d79a6e728ce2e7235e39c3ea291 Mon Sep 17 00:00:00 2001 From: aryaantony92 Date: Wed, 21 Jun 2023 09:44:37 +0200 Subject: [PATCH 1/5] Fix Codeception --- tests/Unit/Targeting/Document/TargetGroupEditableTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Unit/Targeting/Document/TargetGroupEditableTest.php b/tests/Unit/Targeting/Document/TargetGroupEditableTest.php index dd9243b..d9f94db 100644 --- a/tests/Unit/Targeting/Document/TargetGroupEditableTest.php +++ b/tests/Unit/Targeting/Document/TargetGroupEditableTest.php @@ -65,7 +65,7 @@ public function testTargetGroupsEditable(): void //Test the value of first target group editable again $this->testDataHelper->assertInput($this->testPage, $targetGroupEditableName1, $targetGroup1EditableSeed); - $this->reloadPage(); + //$this->reloadPage(); // Test after reloading $this->testDataHelper->assertInput($this->testPage, $targetGroupEditableName1, $targetGroup1EditableSeed); From 4e41a8b4ee14c9c460e599ac3eeb9f210997ae3c Mon Sep 17 00:00:00 2001 From: aryaantony92 <97134765+aryaantony92@users.noreply.github.com> Date: Thu, 13 Jul 2023 13:35:13 +0200 Subject: [PATCH 2/5] Reeenable Reload Test --- tests/Unit/Targeting/Document/TargetGroupEditableTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Unit/Targeting/Document/TargetGroupEditableTest.php b/tests/Unit/Targeting/Document/TargetGroupEditableTest.php index d9f94db..dd9243b 100644 --- a/tests/Unit/Targeting/Document/TargetGroupEditableTest.php +++ b/tests/Unit/Targeting/Document/TargetGroupEditableTest.php @@ -65,7 +65,7 @@ public function testTargetGroupsEditable(): void //Test the value of first target group editable again $this->testDataHelper->assertInput($this->testPage, $targetGroupEditableName1, $targetGroup1EditableSeed); - //$this->reloadPage(); + $this->reloadPage(); // Test after reloading $this->testDataHelper->assertInput($this->testPage, $targetGroupEditableName1, $targetGroup1EditableSeed); From 83c82b78038c4baa3d22a2df6026899349747a29 Mon Sep 17 00:00:00 2001 From: Olivier Grandmougin Date: Mon, 16 Oct 2023 17:46:24 +0200 Subject: [PATCH 3/5] fix: Add Missing Profiler templates --- templates/Profiler/data_collector.html.twig | 62 ++++++++++++++++++++ templates/Profiler/key_value_table.html.twig | 27 +++++++++ 2 files changed, 89 insertions(+) create mode 100644 templates/Profiler/data_collector.html.twig create mode 100644 templates/Profiler/key_value_table.html.twig diff --git a/templates/Profiler/data_collector.html.twig b/templates/Profiler/data_collector.html.twig new file mode 100644 index 0000000..cbb6fb0 --- /dev/null +++ b/templates/Profiler/data_collector.html.twig @@ -0,0 +1,62 @@ +{% extends '@WebProfiler/Profiler/layout.html.twig' %} + +{% block toolbar %} + {% import _self as macros %} + + {% set icon %} + {# this is the content displayed as a panel in the toolbar #} +
+ {{ include("@PimcoreCore/Profiler/logo.svg.twig") }} +
+ {% endset %} + + {% set text %} + {# this is the content displayed when hovering the mouse over + the toolbar panel #} +
+ Version + {{ collector.version }} build {{ collector.revision }} +
+ +
+ Context + {{ collector.context }} +
+ {% endset %} + + {# the 'link' value set to 'false' means that this panel doesn't + show a section in the web profiler #} + {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: true }) }} +{% endblock %} + +{% block menu %} + + + {{ include("@PimcoreCore/Profiler/logo.svg.twig") }} + + Pimcore + +{% endblock %} + +{% block panel %} + {% import _self as macros %} + +

Pimcore

+ +
+
+ {{ collector.version }} + Version +
+ +
+ {{ collector.revision }} + Build +
+ +
+ {{ collector.context }} + Request Context +
+
+{% endblock %} \ No newline at end of file diff --git a/templates/Profiler/key_value_table.html.twig b/templates/Profiler/key_value_table.html.twig new file mode 100644 index 0000000..3a1a136 --- /dev/null +++ b/templates/Profiler/key_value_table.html.twig @@ -0,0 +1,27 @@ + + + + + + + + + {% for key in data|keys %} + + + {# @see https://talk.pimcore.org/t/profiler-error-when-viewing-targeting-tab/4097/2 #} + + + {% else %} + + + + {% endfor %} + +
{{ labels is defined ? labels[0] : 'Key' }}{{ labels is defined ? labels[1] : 'Value' }}
{{ key }} + {% if data[key] is iterable %} + {{ profiler_dump(data[key], maxDepth=maxDepth|default(0)) }} + {% else %} + {{ data[key] }} + {% endif %} +
(no data)
\ No newline at end of file From fd8de32a3bf438d5c4a259daa56821b7410cfc25 Mon Sep 17 00:00:00 2001 From: Olivier Grandmougin Date: Mon, 16 Oct 2023 19:10:19 +0200 Subject: [PATCH 4/5] Revert "fix: Add Missing Profiler templates" This reverts commit 4daa32fd667af462d0bc1492422add80db97d1f8. --- templates/Profiler/data_collector.html.twig | 62 -------------------- templates/Profiler/key_value_table.html.twig | 27 --------- 2 files changed, 89 deletions(-) delete mode 100644 templates/Profiler/data_collector.html.twig delete mode 100644 templates/Profiler/key_value_table.html.twig diff --git a/templates/Profiler/data_collector.html.twig b/templates/Profiler/data_collector.html.twig deleted file mode 100644 index cbb6fb0..0000000 --- a/templates/Profiler/data_collector.html.twig +++ /dev/null @@ -1,62 +0,0 @@ -{% extends '@WebProfiler/Profiler/layout.html.twig' %} - -{% block toolbar %} - {% import _self as macros %} - - {% set icon %} - {# this is the content displayed as a panel in the toolbar #} -
- {{ include("@PimcoreCore/Profiler/logo.svg.twig") }} -
- {% endset %} - - {% set text %} - {# this is the content displayed when hovering the mouse over - the toolbar panel #} -
- Version - {{ collector.version }} build {{ collector.revision }} -
- -
- Context - {{ collector.context }} -
- {% endset %} - - {# the 'link' value set to 'false' means that this panel doesn't - show a section in the web profiler #} - {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: true }) }} -{% endblock %} - -{% block menu %} - - - {{ include("@PimcoreCore/Profiler/logo.svg.twig") }} - - Pimcore - -{% endblock %} - -{% block panel %} - {% import _self as macros %} - -

Pimcore

- -
-
- {{ collector.version }} - Version -
- -
- {{ collector.revision }} - Build -
- -
- {{ collector.context }} - Request Context -
-
-{% endblock %} \ No newline at end of file diff --git a/templates/Profiler/key_value_table.html.twig b/templates/Profiler/key_value_table.html.twig deleted file mode 100644 index 3a1a136..0000000 --- a/templates/Profiler/key_value_table.html.twig +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - {% for key in data|keys %} - - - {# @see https://talk.pimcore.org/t/profiler-error-when-viewing-targeting-tab/4097/2 #} - - - {% else %} - - - - {% endfor %} - -
{{ labels is defined ? labels[0] : 'Key' }}{{ labels is defined ? labels[1] : 'Value' }}
{{ key }} - {% if data[key] is iterable %} - {{ profiler_dump(data[key], maxDepth=maxDepth|default(0)) }} - {% else %} - {{ data[key] }} - {% endif %} -
(no data)
\ No newline at end of file From b7facdd8d7788e6c113a9d4933f37a763bfbeba6 Mon Sep 17 00:00:00 2001 From: Olivier Grandmougin Date: Mon, 16 Oct 2023 19:14:10 +0200 Subject: [PATCH 5/5] fix: Call PimcoreCore Bundle profiler templates --- templates/Profiler/targeting_data_collector.html.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/Profiler/targeting_data_collector.html.twig b/templates/Profiler/targeting_data_collector.html.twig index b30d0d2..1646c79 100644 --- a/templates/Profiler/targeting_data_collector.html.twig +++ b/templates/Profiler/targeting_data_collector.html.twig @@ -181,7 +181,7 @@

Visitor Info

- {{ include('@PimcorePersonalization/Profiler/key_value_table.html.twig', { data: collector.visitorInfo }, with_context = false) }} + {{ include('@PimcoreCore/Profiler/key_value_table.html.twig', { data: collector.visitorInfo }, with_context = false) }}
@@ -191,13 +191,13 @@

Session Storage

- {{ include('@PimcorePersonalization/Profiler/key_value_table.html.twig', { data: collector.storage.session }, with_context = false) }} + {{ include('@PimcoreCore/Profiler/key_value_table.html.twig', { data: collector.storage.session }, with_context = false) }}

Visitor Storage

- {{ include('@PimcorePersonalization/Profiler/key_value_table.html.twig', { data: collector.storage.visitor }, with_context = false) }} + {{ include('@PimcoreCore/Profiler/key_value_table.html.twig', { data: collector.storage.visitor }, with_context = false) }}