fix issue (WP-834) Elementor content partially missing upon translation #489

vsolovei-smartling · 2023-10-10T16:17:20Z

No description provided.

vsolovei-smartling · 2023-10-10T16:17:58Z

inc/config/logger.yml

  logger.filehandler.standard.maxfiles: 1

-  logger.formatter.date: "Y-m-d\TH:i:s.up"
+  logger.formatter.date: "Y-m-d\\TH:i:s.up"


Seen as error in logs, originally thought this caused the issue

Why do we need this slash at all here?

The parser library triggers an error (E_USER_ERROR), as per their requirements, doubly quoted strings must escape the slash. It ends up in logs, but WordPress is not down, as the log entries state

vsolovei-smartling · 2023-10-10T16:18:15Z

inc/Smartling/ContentTypes/ExternalContentElementor.php

                    }
                    if (is_array($setting)) {
-                        if (array_key_exists('id', $setting) && array_key_exists('url', $setting) && is_int($setting['id'])) {
+                        if (array_key_exists('id', $setting) && array_key_exists('url', $setting) && is_int($setting['id']) && ($setting['source'] ?? '') === 'library') {


Ensured only attachments from WP media library get replaced

vsolovei-smartling · 2023-10-10T16:18:40Z

inc/Smartling/ContentTypes/ExternalContentElementor.php

    private function getRelatedFromSetting(array $setting): ?array {
-        if ($setting['source'] ?? '' === 'library' && array_key_exists('id', $setting)) {
-            return [ContentTypeHelper::POST_TYPE_ATTACHMENT => [$setting['id'] => $setting['id']]];
+        if (($setting['source'] ?? '') === 'library' && ($setting['id'] ?? '') !== '') {


Real cause of the issue, empty ids were added to related content discovery service, preventing correct functioning

vsolovei-smartling · 2023-10-10T16:19:21Z

inc/Smartling/ContentTypes/ExternalContentElementor.php

-        if ($setting['source'] ?? '' === 'library' && array_key_exists('id', $setting)) {
-            return [ContentTypeHelper::POST_TYPE_ATTACHMENT => [$setting['id'] => $setting['id']]];
+        if (($setting['source'] ?? '') === 'library' && ($setting['id'] ?? '') !== '') {
+            return [ContentTypeHelper::POST_TYPE_ATTACHMENT => [$setting['id']]];


Return format made consistent with other external content providers

vsolovei-smartling · 2023-10-10T16:20:02Z

smartling-connector.php

 * License URI:       http://www.gnu.org/licenses/gpl-2.0.txt
 * Text Domain:       smartling-connector
 * Domain Path:       /languages
+ * Requires PHP:      8.0


Not issue related, but when performing manual updates WP gets information from plugin php file instead of readme

vsolovei-smartling · 2023-10-10T16:20:37Z

tests/Smartling/ContentTypes/ExternalContentElementorTest.php

-        $submissionManager->expects($this->exactly(2))->method('findOne')->withConsecutive([[
-            SubmissionEntity::FIELD_CONTENT_TYPE => ContentTypeHelper::POST_TYPE_ATTACHMENT,
-            SubmissionEntity::FIELD_SOURCE_BLOG_ID => $sourceBlogId,
-            SubmissionEntity::FIELD_TARGET_BLOG_ID => $targetBlogId,
-            SubmissionEntity::FIELD_SOURCE_ID => $sourceAttachmentId,
-        ]], [[
-            SubmissionEntity::FIELD_CONTENT_TYPE => ExternalContentElementor::CONTENT_TYPE_ELEMENTOR_LIBRARY,
-            SubmissionEntity::FIELD_SOURCE_BLOG_ID => $sourceBlogId,
-            SubmissionEntity::FIELD_TARGET_BLOG_ID => $targetBlogId,
-            SubmissionEntity::FIELD_SOURCE_ID => $sourceWidgetId,
-        ]])->willReturnOnConsecutiveCalls($foundSubmissionAttachment, $foundSubmissionWidget);
+        $matcher = $this->exactly(3);
+        $submissionManager->expects($matcher)->method('findOne')->willReturnCallback(
+            function ($value) use ($foundSubmissionAttachment, $foundSubmissionBackground, $foundSubmissionWidget, $matcher, $sourceAttachmentId, $sourceBackgroundId, $sourceBlogId, $sourceWidgetId, $targetBlogId) {
+                switch ($matcher->getInvocationCount()) {
+                    case 1:
+                        $this->assertEquals([
+                            SubmissionEntity::FIELD_CONTENT_TYPE => ContentTypeHelper::POST_TYPE_ATTACHMENT,
+                            SubmissionEntity::FIELD_SOURCE_BLOG_ID => $sourceBlogId,
+                            SubmissionEntity::FIELD_TARGET_BLOG_ID => $targetBlogId,
+                            SubmissionEntity::FIELD_SOURCE_ID => $sourceAttachmentId,
+                        ], $value);
+
+                        return $foundSubmissionAttachment;
+                    case 2:
+                        $this->assertEquals([
+                            SubmissionEntity::FIELD_CONTENT_TYPE => ContentTypeHelper::POST_TYPE_ATTACHMENT,
+                            SubmissionEntity::FIELD_SOURCE_BLOG_ID => $sourceBlogId,
+                            SubmissionEntity::FIELD_TARGET_BLOG_ID => $targetBlogId,
+                            SubmissionEntity::FIELD_SOURCE_ID => $sourceBackgroundId,
+                        ], $value);
+
+                        return $foundSubmissionBackground;
+                    case 3:
+                        $this->assertEquals([
+                            SubmissionEntity::FIELD_CONTENT_TYPE => ExternalContentElementor::CONTENT_TYPE_ELEMENTOR_LIBRARY,
+                            SubmissionEntity::FIELD_SOURCE_BLOG_ID => $sourceBlogId,
+                            SubmissionEntity::FIELD_TARGET_BLOG_ID => $targetBlogId,
+                            SubmissionEntity::FIELD_SOURCE_ID => $sourceWidgetId,
+                        ], $value);
+
+                        return $foundSubmissionWidget;
+                }
+                throw new \LogicException('Unexpected invocation');
+            }
+        );


Added test case for background image and removed deprecated withConsecutive

vsolovei-smartling · 2023-10-10T16:21:07Z

tests/Smartling/Models/ExternalDataTest.php

+
+class ExternalDataTest extends TestCase {
+
+    public function testAddRelated()


Added expectations for external content providers as test

dimitrystd · 2023-10-10T18:41:22Z

inc/config/logger.yml

  logger.filehandler.standard.maxfiles: 1

-  logger.formatter.date: "Y-m-d\TH:i:s.up"
+  logger.formatter.date: "Y-m-d\\TH:i:s.up"


Why do we need this slash at all here?

readme.txt

Co-authored-by: Dmitry Studynsky <dimitrystd@users.noreply.github.com>

fix issues (WP-834)

109ae4a

vsolovei-smartling requested review from PavelLoparev and dimitrystd October 10, 2023 16:17

vsolovei-smartling commented Oct 10, 2023

View reviewed changes

dimitrystd changed the title ~~fix issue (WP-834)~~ fix issue (WP-834) Elementor content partially missing upon translation Oct 10, 2023

dimitrystd approved these changes Oct 10, 2023

View reviewed changes

Update readme

59a7bd3

Co-authored-by: Dmitry Studynsky <dimitrystd@users.noreply.github.com>

vsolovei-smartling merged commit f675961 into master Oct 11, 2023

vsolovei-smartling deleted the WP-834-elementor-content-not-replaced branch October 11, 2023 09:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix issue (WP-834) Elementor content partially missing upon translation #489

fix issue (WP-834) Elementor content partially missing upon translation #489

Uh oh!

vsolovei-smartling commented Oct 10, 2023

Uh oh!

vsolovei-smartling Oct 10, 2023

Uh oh!

dimitrystd Oct 10, 2023

Uh oh!

vsolovei-smartling Oct 11, 2023

Uh oh!

vsolovei-smartling Oct 10, 2023

Uh oh!

vsolovei-smartling Oct 10, 2023

Uh oh!

vsolovei-smartling Oct 10, 2023

Uh oh!

vsolovei-smartling Oct 10, 2023

Uh oh!

vsolovei-smartling Oct 10, 2023

Uh oh!

vsolovei-smartling Oct 10, 2023

Uh oh!

dimitrystd Oct 10, 2023

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants


		class ExternalDataTest extends TestCase {

		public function testAddRelated()

fix issue (WP-834) Elementor content partially missing upon translation #489

fix issue (WP-834) Elementor content partially missing upon translation #489

Uh oh!

Conversation

vsolovei-smartling commented Oct 10, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants