diff --git a/src/templates/_components/utilities/configuration.twig b/src/templates/_components/utilities/configuration.twig
index 43210093..1f426cdb 100644
--- a/src/templates/_components/utilities/configuration.twig
+++ b/src/templates/_components/utilities/configuration.twig
@@ -102,6 +102,17 @@
}) }}
+
+ {{ forms.checkbox({
+ label: 'Publish translations asynchronously',
+ name: 'publishTranslationsAsync',
+ id: 'publishTranslationsAsync',
+ checked: publishTranslationsAsync,
+ errors: model is defined? model.getErrors('publishTranslationsAsync') : [],
+ disabled: liltConfigDisabled
+ }) }}
+
+
{{ forms.textField({
name: 'liltConfigDisabled',
id: 'liltConfigDisabled',
diff --git a/src/templates/job/create.twig b/src/templates/job/create.twig
index a5e3229f..7c9be798 100644
--- a/src/templates/job/create.twig
+++ b/src/templates/job/create.twig
@@ -4,6 +4,7 @@
{% set title = title ?? "Create a new job" %}
{% set isJobInProgress = constant('STATUS_IN_PROGRESS', element) is same as element.getStatus() %}
+{% set isJobPublishing = (constant('STATUS_PUBLISHING', element) is same as element.getStatus()) %}
{% set isJobReadyForReview = constant('STATUS_READY_FOR_REVIEW', element) is same as element.getStatus() %}
{% set formActionUrl = formActionUrl ?? cpUrl('craft-lilt-plugin/job/create') %}
diff --git a/src/templates/job/edit.twig b/src/templates/job/edit.twig
index cf6e13c5..808fbfbd 100644
--- a/src/templates/job/edit.twig
+++ b/src/templates/job/edit.twig
@@ -2,6 +2,7 @@
{% import '_includes/forms' as forms %}
{% set isJobInProgress = constant('STATUS_IN_PROGRESS', element) is same as element.getStatus() %}
+{% set isJobPublishing = (constant('STATUS_PUBLISHING', element) is same as element.getStatus()) %}
{% set isDraftJob = constant('STATUS_DRAFT', element) is same as element.getStatus() %}
{% set isNewJob = constant('STATUS_NEW', element) is same as element.getStatus() %}
{% set isFailed = constant('STATUS_FAILED', element) is same as element.getStatus() %}
@@ -148,11 +149,11 @@
redirect: hashedCpEditUrl,
},
}) }}
- {% elseif not isJobReadyForReview and not isJobInProgress %}
+ {% elseif not isJobReadyForReview and not isJobInProgress and not isJobPublishing %}
{% endif %}
{% endblock %}
- {% if formActions ?? false and not isJobInProgress %}
+ {% if formActions ?? false and not isJobInProgress and not isJobPublishing %}
{% include '_layouts/components/form-action-menu' %}
{% endif %}
diff --git a/src/utilities/Configuration.php b/src/utilities/Configuration.php
index 03dbd5b7..72683a56 100644
--- a/src/utilities/Configuration.php
+++ b/src/utilities/Configuration.php
@@ -32,6 +32,8 @@ public static function id(): string
public static function contentHtml(): string
{
+ $settingsRepository = Craftliltplugin::getInstance()->settingsRepository;
+
//TODO: move to service settings logic
$liltConfigDisabled = false;
$settingsResult = null;
@@ -78,25 +80,6 @@ public static function contentHtml(): string
$connectorApiUrl = $connectorApiUrlRecord->value
?? \LiltConnectorSDK\Configuration::getDefaultConfiguration()->getHost();
- $enableEntriesForTargetSitesRecord = SettingRecord::findOne(['name' => 'enable_entries_for_target_sites']);
- $enableEntriesForTargetSites = (bool) ($enableEntriesForTargetSitesRecord->value
- ?? false);
-
- $copyEntriesSlugFromSourceToTargetRecord = SettingRecord::findOne(
- ['name' => 'copy_entries_slug_from_source_to_target']
- );
- $copyEntriesSlugFromSourceToTarget = (bool) ($copyEntriesSlugFromSourceToTargetRecord->value ?? false);
-
- $queueEachTranslationFileSeparately = SettingRecord::findOne(
- ['name' => SettingsRepository::QUEUE_EACH_TRANSLATION_FILE_SEPARATELY,]
- );
- $queueEachTranslationFileSeparately = (bool) ($queueEachTranslationFileSeparately->value ?? false);
-
- $queueDisableAutomaticSync = SettingRecord::findOne(
- ['name' => SettingsRepository::QUEUE_DISABLE_AUTOMATIC_SYNC,]
- );
- $queueDisableAutomaticSync = (bool) ($queueDisableAutomaticSync->value ?? false);
-
return Craft::$app->getView()->renderTemplate(
'craft-lilt-plugin/_components/utilities/configuration.twig',
[
@@ -107,11 +90,22 @@ public static function contentHtml(): string
'connectorApiKey' => $connectorApiKey,
'connectorApiUrl' => $connectorApiUrl,
'formActionUrl' => UrlHelper::cpUrl('craft-lilt-plugin/settings/lilt-configuration'),
- 'liltConfigDisabled' => (int) $liltConfigDisabled,
- 'enableEntriesForTargetSites' => $enableEntriesForTargetSites,
- 'copyEntriesSlugFromSourceToTarget' => $copyEntriesSlugFromSourceToTarget,
- 'queueEachTranslationFileSeparately' => $queueEachTranslationFileSeparately,
- 'queueDisableAutomaticSync' => $queueDisableAutomaticSync,
+ 'liltConfigDisabled' => (int)$liltConfigDisabled,
+ 'enableEntriesForTargetSites' => $settingsRepository->getBool(
+ SettingsRepository::ENABLE_ENTRIES_FOR_TARGET_SITES
+ ),
+ 'copyEntriesSlugFromSourceToTarget' => $settingsRepository->getBool(
+ SettingsRepository::COPY_ENTRIES_SLUG_FROM_SOURCE_TO_TARGET
+ ),
+ 'queueEachTranslationFileSeparately' => $settingsRepository->getBool(
+ SettingsRepository::QUEUE_EACH_TRANSLATION_FILE_SEPARATELY
+ ),
+ 'queueDisableAutomaticSync' => $settingsRepository->getBool(
+ SettingsRepository::QUEUE_DISABLE_AUTOMATIC_SYNC
+ ),
+ 'publishTranslationsAsync' => $settingsRepository->getBool(
+ SettingsRepository::PUBLISH_TRANSLATIONS_ASYNC
+ ),
]
);
}
diff --git a/tests/_support/Helper/CraftLiltPluginHelper.php b/tests/_support/Helper/CraftLiltPluginHelper.php
index 637958f1..1f554d16 100644
--- a/tests/_support/Helper/CraftLiltPluginHelper.php
+++ b/tests/_support/Helper/CraftLiltPluginHelper.php
@@ -207,11 +207,11 @@ public function disableOption(string $name): void
private function setOption(string $name, int $value): void
{
$settingRecord = SettingRecord::findOne(
- ['name' => SettingsRepository::QUEUE_DISABLE_AUTOMATIC_SYNC]
+ ['name' => $name]
);
if (!$settingRecord) {
$settingRecord = new SettingRecord(
- ['name' => SettingsRepository::QUEUE_DISABLE_AUTOMATIC_SYNC]
+ ['name' => $name]
);
}
diff --git a/tests/integration/AbstractIntegrationCest.php b/tests/integration/AbstractIntegrationCest.php
index 9fd60430..b3b943b2 100644
--- a/tests/integration/AbstractIntegrationCest.php
+++ b/tests/integration/AbstractIntegrationCest.php
@@ -7,6 +7,7 @@
use Craft;
use craft\helpers\Db;
use IntegrationTester;
+use lilthq\craftliltplugin\services\repositories\SettingsRepository;
use WireMock\Client\WireMock;
use yii\db\Exception;
@@ -21,9 +22,15 @@ public function _before(IntegrationTester $I): void
Db::truncateTable(Craft::$app->queue->tableName);
$I->clearQueue();
+
+ $I->disableOption(SettingsRepository::COPY_ENTRIES_SLUG_FROM_SOURCE_TO_TARGET);
+ $I->disableOption(SettingsRepository::PUBLISH_TRANSLATIONS_ASYNC);
}
public function _after(IntegrationTester $I): void
{
$I->expectAllRequestsAreMatched();
+
+ $I->disableOption(SettingsRepository::COPY_ENTRIES_SLUG_FROM_SOURCE_TO_TARGET);
+ $I->disableOption(SettingsRepository::PUBLISH_TRANSLATIONS_ASYNC);
}
}
diff --git a/tests/integration/controllers/translation/PostTranslationPublishControllerCest.php b/tests/integration/controllers/translation/PostTranslationPublishControllerCest.php
index 6337f7be..0923674b 100644
--- a/tests/integration/controllers/translation/PostTranslationPublishControllerCest.php
+++ b/tests/integration/controllers/translation/PostTranslationPublishControllerCest.php
@@ -4,19 +4,19 @@
namespace lilthq\craftliltplugintests\integration\controllers\translation;
-use Codeception\Exception\ModuleException;
use Craft;
use craft\elements\Entry;
use IntegrationTester;
use LiltConnectorSDK\Model\SettingsResponse;
use lilthq\craftliltplugin\Craftliltplugin;
use lilthq\craftliltplugin\elements\Job;
+use lilthq\craftliltplugin\modules\PublishTranslation;
use lilthq\craftliltplugin\parameters\CraftliltpluginParameters;
use lilthq\craftliltplugin\records\JobRecord;
-use lilthq\craftliltplugin\records\SettingRecord;
use lilthq\craftliltplugin\records\TranslationRecord;
use lilthq\craftliltplugin\services\appliers\TranslationApplyCommand;
use lilthq\craftliltplugin\services\handlers\commands\CreateDraftCommand;
+use lilthq\craftliltplugin\services\repositories\SettingsRepository;
use lilthq\craftliltplugintests\integration\AbstractIntegrationCest;
use lilthq\tests\fixtures\EntriesFixture;
use PHPUnit\Framework\Assert;
@@ -32,17 +32,10 @@ public function _fixtures(): array
];
}
- /**
- * @throws ModuleException
- */
public function testCopySlugSettingEnabled(IntegrationTester $I): void
{
// enable copy slug
- $copyEntriesSlugFromSourceToTarget = new SettingRecord(
- ['name' => 'copy_entries_slug_from_source_to_target']
- );
- $copyEntriesSlugFromSourceToTarget->value = 1;
- $copyEntriesSlugFromSourceToTarget->save();
+ $I->enableOption(SettingsRepository::COPY_ENTRIES_SLUG_FROM_SOURCE_TO_TARGET);
$user = Craft::$app->getUsers()->getUserById(1);
$I->amLoggedInAs($user);
@@ -146,21 +139,12 @@ public function testCopySlugSettingEnabled(IntegrationTester $I): void
$I->assertTranslationStatus($translationToSubmit->id, TranslationRecord::STATUS_PUBLISHED);
$I->assertJobStatus($job->id, Job::STATUS_COMPLETE);
-
- $copyEntriesSlugFromSourceToTarget->delete();
}
- /**
- * @throws ModuleException
- */
public function testCopySlugSettingDisabled(IntegrationTester $I): void
{
// enable copy slug
- $copyEntriesSlugFromSourceToTarget = new SettingRecord(
- ['name' => 'copy_entries_slug_from_source_to_target']
- );
- $copyEntriesSlugFromSourceToTarget->value = 0;
- $copyEntriesSlugFromSourceToTarget->save();
+ $I->disableOption(SettingsRepository::COPY_ENTRIES_SLUG_FROM_SOURCE_TO_TARGET);
$user = Craft::$app->getUsers()->getUserById(1);
$I->amLoggedInAs($user);
@@ -264,8 +248,95 @@ public function testCopySlugSettingDisabled(IntegrationTester $I): void
$I->assertTranslationStatus($translationToSubmit->id, TranslationRecord::STATUS_PUBLISHED);
$I->assertJobStatus($job->id, Job::STATUS_COMPLETE);
+ }
+
+ public function testAsyncPublishing(IntegrationTester $I): void
+ {
+ // enable copy slug
+ $I->enableOption(SettingsRepository::PUBLISH_TRANSLATIONS_ASYNC);
+
+ $user = Craft::$app->getUsers()->getUserById(1);
+ $I->amLoggedInAs($user);
+
+ $siteIds = Craftliltplugin::getInstance()->languageMapper->getSiteIdsByLanguages(['ru-RU', 'de-DE', 'es-ES']);
+
+ $element = Craft::$app->getElements()->getElementById(
+ Entry::findOne(['authorId' => 1])->id,
+ Entry::class,
+ Craftliltplugin::getInstance()->languageMapper->getSiteIdByLanguage('en-EN')
+ );
+ $element->title = 'This is new title and it should be changed after publishing';
+ $element->slug = 'this-is-new-slug-it-should-be-updated';
+ Craft::$app->getElements()->saveElement($element);
+
+ $entryRu = Craft::$app->getElements()->getElementById(
+ $element->id,
+ Entry::class,
+ Craftliltplugin::getInstance()->languageMapper->getSiteIdByLanguage('ru-RU')
+ );
+ Assert::assertSame('Some example title', $entryRu->title);
+
+ /**
+ * @var Job $job
+ * @var TranslationRecord $translations
+ */
+ [$job, $translations] = $I->createJobWithTranslations([
+ 'title' => 'Awesome test job',
+ 'elementIds' => [$element->id],
+ 'targetSiteIds' => $siteIds,
+ 'sourceSiteId' => Craftliltplugin::getInstance()->languageMapper->getSiteIdByLanguage('en-US'),
+ 'translationWorkflow' => SettingsResponse::LILT_TRANSLATION_WORKFLOW_INSTANT,
+ 'versions' => [],
+ 'authorId' => 1,
+ 'liltJobId' => 777,
+ ]);
- $copyEntriesSlugFromSourceToTarget->delete();
+ $draft = Craftliltplugin::getInstance()->createDraftHandler->create(
+ new CreateDraftCommand(
+ Craft::$app->getElements()->getElementById(
+ $element->id,
+ Entry::class,
+ Craftliltplugin::getInstance()->languageMapper->getSiteIdByLanguage('en-EN')
+ ),
+ $job->title,
+ $job->siteId,
+ Craftliltplugin::getInstance()->languageMapper->getSiteIdByLanguage('ru-RU'),
+ 'instant',
+ $job->authorId
+ )
+ );
+
+
+ $I->sendAjaxPostRequest(
+ sprintf('?p=admin/actions/%s', CraftliltpluginParameters::TRANSLATION_PUBLISH_ACTION),
+ [
+ 'csrf' => Craft::$app->getRequest()->getCsrfToken(true),
+ 'translationIds' => array_map(function (TranslationRecord $translationRecord) {
+ return $translationRecord->id;
+ }, $translations),
+ ]
+ );
+
+ $I->seeResponseCodeIs(200);
+
+ Craft::$app->elements->invalidateCachesForElement($element);
+
+ foreach ($translations as $translation) {
+ $I->assertJobInQueue(
+ (new PublishTranslation(
+ [
+ 'jobId' => $translation->jobId,
+ 'draftId' => $translation->translatedDraftId,
+ 'targetSiteId' => $translation->targetSiteId,
+ 'translationId' => $translation->id,
+ ]
+ ))
+ );
+
+ $I->assertTranslationStatus($translation->id, TranslationRecord::STATUS_PUBLISHING);
+ }
+
+ $I->assertJobStatus($job->id, Job::STATUS_PUBLISHING);
}
public function testPublishTranslationJobStatusStaysSame(IntegrationTester $I): void
@@ -347,6 +418,4 @@ public function testPublishTranslationJobStatusStaysSame(IntegrationTester $I):
$I->assertTranslationStatus($translationToSubmit->id, TranslationRecord::STATUS_PUBLISHED);
$I->assertJobStatus($job->id, Job::STATUS_READY_TO_PUBLISH);
}
-
- // TODO: do we need a test case when all fields are translated?
}