Merge pull request #314 from AcclaroInc/release/2.1.4

Release/2.1.4

.craftplugin

@@ -1,7 +1,7 @@
 {
     "pluginName": "Translations for Craft",
     "pluginDescription": "Drive global growth with simplified translation workflows.",
-    "pluginVersion": "2.1.3",
+    "pluginVersion": "2.1.4",
     "pluginAuthorName": "Acclaro",
     "pluginVendorName": "Acclaro",
     "pluginAuthorUrl": "http://www.acclaro.com/",

CHANGELOG.md

@@ -4,7 +4,13 @@ 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/).
 
-## Unreleased
+## 2.1.4 - 2022-03-14
+
+### Updated
+- ISO alias mapping API endpoint (https://github.com/AcclaroInc/craft-translations/pull/315)
+
+### Fixed
+- Plugin uninstallation bug (https://github.com/AcclaroInc/craft-translations/pull/313)
 
 ## 2.1.3 - 2022-02-21
 

composer.json

@@ -29,6 +29,7 @@
         "php": ">=7.2.0",
         "sebastian/diff": "^3.0",
         "composer/composer": "^2.1.9",
+        "enshrined/svg-sanitize": "~0.14.0|~0.15.2",
 		"spatie/guzzle-rate-limiter-middleware": "^2.0"
     },
     "autoload": {

src/Constants.php

@@ -165,8 +165,8 @@ class Constants
     ];
 
     // Craft Graphql data
-    const GRAPHQL_API_BASE_URI = 'https://acclarocraft3.com/api';
-    const GRAPHQL_ISO_MAPPING_TOKEN = 'G3LIVghEQhBwZEqDSaXYgTB6STSHDiqs';
+    const GRAPHQL_API_BASE_URI = 'https://acclarocraft.com/api';
+    const GRAPHQL_ISO_MAPPING_TOKEN = '6LBN7WdtRFHLAAgVv4G8LA3ifp63SgXm';
     const GRAPHQL_ISO_MAPPING_QUERY = 'query MyQuery {
       entry(slug: "translations-plugin-iso-mapping") {
         dateUpdated @formatDateTime (format: "Y-m-d H:m:s")

src/Translations.php

@@ -206,9 +206,7 @@ function (PluginEvent $event) {
     public function uninstall()
     {
         // Let's clean up the drafts table
-        $files = self::$plugin->fileRepository->getFiles();
-        $drafts = array_column($files, 'draftId');
-
+        $drafts = self::$plugin->fileRepository->getAllDraftIds();
         if ($drafts) {
             Craft::$app->queue->push(new DeleteDrafts([
                 'description' => Constants::JOB_DELETING_DRAFT,

src/services/repository/FileRepository.php

@@ -103,6 +103,25 @@ public function getFiles($orderId = null, $elementId = null, $targetSite = null)
         return $files ? $files : array();
     }
 
+    /**
+     * @return array
+     */
+    public function getAllDraftIds()
+    {
+
+        $records = FileRecord::find()->where(['IS NOT', 'draftId', NULL])->all();
+
+        $draftIds = [];
+
+        foreach ($records as $key => $record) {
+            if(!empty($record->draftId)){
+                $draftIds[] = $record->draftId;
+            }
+        }
+
+        return $draftIds;
+    }
+
     /**
      * @return \acclaro\translations\models\FileModel
      */