Merge pull request #134 from lilt/4.x-ignore-dropdowns

Add setting to ignore all dropdowns

Author: hadomskyi

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.4.1 - 2023-11-08
+### Added
+- Ignore dropdowns setting
+
 ## 4.4.0 - 2023-10-04
 ### Added
 - Queue manager

composer.json

@@ -2,7 +2,7 @@
   "name": "lilt/craft-lilt-plugin",
   "description": "The Lilt plugin makes it easy for you to send content to Lilt for translation right from within Craft CMS.",
   "type": "craft-plugin",
-  "version": "4.4.0",
+  "version": "4.4.1",
   "keywords": [
     "craft",
     "cms",

e2e/happy-lager-override/config/general.php

@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * General Configuration
+ *
+ * All of your system's general configuration settings go in here. You can see a
+ * list of the available settings in vendor/craftcms/cms/src/config/GeneralConfig.php.
+ *
+ * @see \craft\config\GeneralConfig
+ */
+
+use craft\helpers\App;
+
+$isDev = App::env('ENVIRONMENT') === 'dev';
+$isProd = App::env('ENVIRONMENT') === 'production';
+
+return [
+    // Default Week Start Day (0 = Sunday, 1 = Monday...)
+    'defaultWeekStartDay' => 1,
+
+    // Whether generated URLs should omit "index.php"
+    'omitScriptNameInUrls' => true,
+
+    // The URI segment that tells Craft to load the control panel
+    'cpTrigger' => App::env('CP_TRIGGER') ?: 'admin',
+
+    // The secure key Craft will use for hashing and encrypting data
+    'securityKey' => App::env('SECURITY_KEY'),
+
+    // Whether Dev Mode should be enabled (see https://craftcms.com/guides/what-dev-mode-does)
+    'devMode' => true,
+
+    // Whether administrative changes should be allowed
+    'allowAdminChanges' => true,
+
+    // Whether updates should be allowed
+    'allowUpdates' => $isDev,
+
+    // Whether crawlers should be allowed to index pages and following links
+    'disallowRobots' => !$isProd,
+
+    'aliases' => [
+        '@assetBasePath' => App::env('ASSET_BASE_PATH') ?: "./assets",
+        '@assetBaseUrl' => App::env('ASSET_BASE_URL') ?: "/assets",
+    ],
+];

src/modules/FetchJobStatusFromConnector.php

@@ -61,6 +61,15 @@ public function execute($queue): void
             return;
         }
 
+        $mutex = Craft::$app->getMutex();
+        $mutexKey = $this->getMutexKey();
+        if (!$mutex->acquire($mutexKey)) {
+            Craft::error(sprintf('Job %s is already processing job %d', __CLASS__, $this->jobId));
+
+            $this->markAsDone($queue);
+            return;
+        }
+
         $liltJob = Craftliltplugin::getInstance()->connectorJobRepository->findOneById($this->liltJobId);
         $isJobFinished = $liltJob->getStatus() !== JobResponse::STATUS_PROCESSING
             && $liltJob->getStatus() !== JobResponse::STATUS_QUEUED;
@@ -314,6 +323,10 @@ public function getRetryJob(): BaseJob
 
     public static function getDelay(): int
     {
+        if (!Craft::$app->config->general->devMode) {
+            return self::DELAY_IN_SECONDS;
+        }
+
         $envDelay = getenv('CRAFT_LILT_PLUGIN_QUEUE_DELAY_IN_SECONDS');
         if (!empty($envDelay) || $envDelay === '0') {
             return (int)$envDelay;

src/services/ServiceInitializer.php

@@ -98,6 +98,9 @@ public function run(): void
                 'class' => ListenerRegister::class,
                 'availableListeners' => CraftliltpluginParameters::LISTENERS,
             ],
+            'settingsRepository' => [
+                'class' => SettingsRepository::class,
+            ],
         ]);
 
         $pluginInstance->setComponents([
@@ -153,7 +156,7 @@ function () {
         ]);
 
         $getProvidersMap = static function () use ($pluginInstance) {
-            return [
+            $providersMap = [
                 CraftliltpluginParameters::CRAFT_FIELDS_PLAINTEXT => new PlainTextContentProvider(),
                 CraftliltpluginParameters::CRAFT_REDACTOR_FIELD => new RedactorPluginFieldContentProvider(),
                 CraftliltpluginParameters::CRAFT_FIELDS_TABLE => new TableContentProvider(),
@@ -179,6 +182,13 @@ function () {
                 #SuperTable Plugin
                 CraftliltpluginParameters::CRAFT_FIELDS_SUPER_TABLE => new ElementQueryContentProvider(),
             ];
+
+            //TODO: make it in proper way
+            if (Craftliltplugin::getInstance()->settingsRepository->ignoreDropdowns()) {
+                unset($providersMap[CraftliltpluginParameters::CRAFT_FIELDS_DROPDOWN]);
+            }
+
+            return $providersMap;
         };
 
         $pluginInstance->set(
@@ -261,10 +271,6 @@ function () {
                     'class' => ConnectorFileRepository::class,
                     'apiInstance' => $pluginInstance->connectorJobsApi,
                 ],
-            'settingsRepository' =>
-                [
-                    'class' => SettingsRepository::class,
-                ],
             'editJobHandler' =>
                 [
                     'class' => EditJobHandler::class,

src/services/providers/field/FieldContentProvider.php

@@ -25,7 +25,7 @@ public function provide(ProvideContentCommand $provideContentCommand)
     {
         $fieldClass = get_class($provideContentCommand->getField());
 
-        if (!isset($this->providersMap[$fieldClass])) {
+        if (!isset($this->providersMap[$fieldClass]) || empty($this->providersMap[$fieldClass])) {
             return null;
         }
 

src/services/repositories/SettingsRepository.php

@@ -9,6 +9,8 @@
 
 namespace lilthq\craftliltplugin\services\repositories;
 
+use Craft;
+use lilthq\craftliltplugin\parameters\CraftliltpluginParameters;
 use lilthq\craftliltplugin\records\SettingRecord;
 
 class SettingsRepository
@@ -19,6 +21,8 @@ class SettingsRepository
     public const QUEUE_EACH_TRANSLATION_FILE_SEPARATELY = 'queue_each_translation_file_separately';
     public const QUEUE_MANAGER_EXECUTED_AT = 'queue_manager_executed_at';
 
+    public const IGNORE_DROPDOWNS = 'ignore_dropdowns';
+
     public function saveLiltApiConnectionConfiguration(string $connectorApiUrl, string $connectorApiKey): void
     {
         # connectorApiKey
@@ -52,6 +56,24 @@ public function isQueueEachTranslationFileSeparately(): bool
         return (bool)$settingValue->value;
     }
 
+    public function ignoreDropdowns(): bool
+    {
+        $tableSchema = Craft::$app->getDb()->schema->getTableSchema(CraftliltpluginParameters::SETTINGS_TABLE_NAME);
+        if ($tableSchema === null) {
+            return false;
+        }
+
+        $settingValue = SettingRecord::findOne(
+            ['name' => SettingsRepository::IGNORE_DROPDOWNS]
+        );
+
+        if (empty($settingValue) || empty($settingValue->value)) {
+            return false;
+        }
+
+        return (bool)$settingValue->value;
+    }
+
     public function save(string $name, string $value): bool
     {
         $settingRecord = SettingRecord::findOne(['name' => $name]);